diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
index 2c00f94eec9049f86d3a1f8c5f9b3b1e0aaf1bd4..fcacd49cc7d74db5517a7a4ef4e3ac26c947cab0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
@@ -113,6 +113,7 @@ public class AutoLayoutMenu implements IContextMenuContributor {
 
 		// Check if model is empty
 		if(pickInstanceOf(ILayoutedModelElement.class, element.getContainedElements()).isEmpty()) {
+			// TODO (FH): use import static
 			return Collections.emptyList();
 		}
 
@@ -121,10 +122,12 @@ public class AutoLayoutMenu implements IContextMenuContributor {
 		// particular also if the model does not contain any connectors, or none of the connectors
 		// is connected to a connection).
 		if(hasConnectedConnectorWithAngle(element)) {
+			// TODO (FH): use import static
 			return Collections.emptyList();
 		}
 		for(IHierarchicElement childElement : element.getContainedElements()) {
 			if(hasConnectedConnectorWithAngle(childElement)) {
+				// TODO (FH): use import static
 				return Collections.emptyList();
 			}
 		}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
index 27ffc2619d979cf37697cb49874dcd1c869f0305..583485c4840e24a45b1f5dd8e340a09f7e6ac351 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
@@ -84,6 +84,7 @@ import de.cau.cs.kieler.klay.layered.properties.Properties;
  * @version $Rev$
  * @ConQAT.Rating YELLOW Hash: 36F683174E3AD8ADC2DDDC27D7C75183
  */
+// TODO (FH): use import static
 public class KielerAutoLayouter implements IAutoLayouter {
 
 	/** Mapping from {@link IHierarchicElement}s to {@link KNode}s. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
index 89b88f0e89eb8e26b6e0448e8b3d98b47521ab55..191b76c7723041dc3d43ba3771fa043d0ee3e6f0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
@@ -37,6 +37,7 @@ import org.fortiss.tooling.base.utils.ZoomUtils;
  * @version $Rev$
  * @ConQAT.Rating YELLOW Hash: FDBEA15E01470E5D318805D3653A4F3F
  */
+// TODO (FH): use import static (multiple occurences below)
 public class ZoomUIUtils {
 
 	/** Factor to align zoomed movements to 0.05 steps (==> avail. zoom factors). */
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
index 12330b040f874360c736834321f69c5b3bbe3c73..17d322817ec67f44cee4a0a9ac12e8ac6f1bf472 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
@@ -150,6 +150,7 @@ public class ConstraintUIBases {
 				return res;
 			}
 
+			// TODO (FH): remove @params or document
 			/**
 			 * @param s
 			 * @return the icon type corresponding to <code>s</code>.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
index 0f57efa3aeb3017cef2d05ea746c7003c1a9b27c..4ccb5286b38bb3b01f284bd81bcb6d68b64e4cf9 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
@@ -56,6 +56,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
  * @version $Rev$
  * @ConQAT.Rating YELLOW Hash: 97453A8CA6928F43F260FB918B4C1AA4
  */
+// TODO (FH): remove @params or document
 public class ConstraintsUIUtils {
 
 	/** Gathers some statuses by verification status. */