diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index 38dbc1c0c9d4065c57434867e835b41ba176027f..aab4e6f2b645ebb0a6af0dde06e9159780dd6aa4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: D08B4E6B896E809A083887F9C6F14F97
+ * @ConQAT.Rating GREEN Hash: 9DC68662D9F1765A0A286793C828A64B
  */
 public class ToolingBaseUIActivator extends AbstractUIPlugin {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
index 631e1dc128169cf1ebcc3339bf27ee277c91f134..b688343e452ca6e943be41c9d2dc66f52f5b0a7e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 1C61F6AB68C85978EAC5B75371A69DED
+ * @ConQAT.Rating GREEN Hash: DC62440F9F73D431A7044F396EC715C9
  */
 public abstract class ConnectorConnectionCompositorBase<HE extends IHierarchicElement, S extends IConnector, T extends IConnector>
 		implements IConnectionCompositor<HE, S, T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
index 7d287a6b608cb74324d355a3d217bb1a59fae0d9..0f41627cc2f1e512f9f2a1f553324954716cac26 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/HierarchicElementConnectionCompositorBase.java
@@ -55,7 +55,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C3FC40AF5B9351FB7B4C3D3A5424CCC1
+ * @ConQAT.Rating GREEN Hash: 37C3A557C68036CCE7206DA269A079F3
  */
 public abstract class HierarchicElementConnectionCompositorBase<HE extends IHierarchicElement, S extends IHierarchicElement, T extends IHierarchicElement>
 		implements IConnectionCompositor<HE, S, T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
index 27ad337359fb4ce8e684acf4b4f0f34a8e5a4722..a4f5ddc09a18df0603f44bc54548848339fe4d3a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
@@ -40,7 +40,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 06F0B1246D80A923D8D6CC99575F57A5
+ * @ConQAT.Rating GREEN Hash: 1C0D4AC12A6198508678FDF15E213AF3
  */
 public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends
 		AbstractTextCellDatabindingEditingSupport {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
index 958c9868ec6021e400034a3f7ac1d327aa6cb9f9..ecba260050d826d1881624151e6bd0aa0051f6a0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 4332834DD629BC28D0C0E6C5F3FBEE60
+ * @ConQAT.Rating RED Hash: 383223FFB9C18CFC5E18AE6C875F2FDA
  */
 public abstract class AbstractTextCellDatabindingEditingSupport extends
 		EditingSupport {
@@ -115,6 +115,8 @@ public abstract class AbstractTextCellDatabindingEditingSupport extends
 		this.cellEditor.setValue("");
 		bindings = createBinding(cellEditor, cell, this.cellEditor, dbc);
 
+		// TODO @review CD: don't we use Eclipse.core.runtime.Assert instead of
+		// CCSMPre?
 		CCSMPre.isTrue(bindings != null && bindings.length > 0
 				&& bindings[0] != null,
 				"Illegal implementation: no binding returned.");
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
index e40039de336cb7efccd53f0fcf6068cd06183c11..f8101af6c652debdf31979d7a2025e69d857fe3b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
@@ -17,6 +17,10 @@ $Id$
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.base.ui.dialog;
 
+import static org.eclipse.jface.dialogs.IDialogConstants.CANCEL_ID;
+import static org.eclipse.jface.dialogs.IDialogConstants.CANCEL_LABEL;
+import static org.eclipse.jface.dialogs.IDialogConstants.OK_ID;
+import static org.eclipse.jface.dialogs.IDialogConstants.OK_LABEL;
 import static org.eclipse.wb.swt.ResourceManager.decorateImage;
 import static org.eclipse.wb.swt.ResourceManager.getPluginImage;
 import static org.eclipse.wb.swt.SWTResourceManager.BOTTOM_RIGHT;
@@ -25,7 +29,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.conqat.ide.commons.ui.jface.TreeContentProviderBase;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -59,9 +62,11 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
  * @author mou
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 83D78C1AC95F8C254DFF26D4569C92C3
+ * @ConQAT.Rating RED Hash: D0847D3C8771737C03D1977C1B5B81DF
  */
 public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
+	// TODO @review CD: Isn't there plenty of code in common with
+	// ElementTreeSingleSelectDialog? -> common base class
 
 	/** Default content provider */
 	private static class EmptyTreeContentProvider extends
@@ -148,6 +153,8 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
 	/** {@inheritDoc} */
 	@Override
 	protected Control createDialogArea(Composite parent) {
+		// TODO @review CD: externalize to *GUI class
+
 		// CAUTION: The code below is automatically generated, do not edit
 		// manually!
 
@@ -303,9 +310,8 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog {
 	/** {@inheritDoc} */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				false);
-		createButton(parent, IDialogConstants.CANCEL_ID, "Cancel", true);
+		createButton(parent, OK_ID, OK_LABEL, false);
+		createButton(parent, CANCEL_ID, CANCEL_LABEL, true);
 	}
 
 	/** {@inheritDoc} */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
index 75a4ae2b50c53e8376da7f08199a740307ca58ba..cdbd5769b3cd23be09ac588b2d4d06095e91f72d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
@@ -62,6 +62,9 @@ import org.eclipse.wb.swt.ResourceManager;
  */
 public class ElementTreeSingleSelectDialog extends TitleAreaDialog {
 
+	// TODO @review CD: Isn't there plenty of code in common with
+	// ElementTreeMultiSelectDialog? -> common base class
+
 	/** GUI Factory */
 	private final FormToolkit formToolkit = new FormToolkit(
 			Display.getDefault());
@@ -141,6 +144,8 @@ public class ElementTreeSingleSelectDialog extends TitleAreaDialog {
 	/** {@inheritDoc} */
 	@Override
 	protected Control createDialogArea(Composite parent) {
+		// TODO @review CD: externalize to *GUI class
+
 		// CAUTION: The code below is automatically generated, do not edit
 		// manually!
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
index 9a6d0fb8e89ce5197d6912f984360a01181a6fc4..65d76b6016fe6111b53e788f653b923cd30bb0d5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
@@ -24,7 +24,7 @@ package org.fortiss.tooling.base.ui.dialog;
  * @author mou
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 18119587EF4CCE8667EF38F2C34D6C76
+ * @ConQAT.Rating GREEN Hash: 5C2B3DE414E278D8C6AF42B9A9B9A9CC
  */
 public interface IDialogEditSupport {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
index 151aaa56b7618078c5535a56e86fe4a9cee57b3d..67a7624c17315215e3ee08d208e05dec6f3c6aa8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author mou
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 03BB6022DF79E9871A0AF7503EA9942A
+ * @ConQAT.Rating GREEN Hash: 2115ED45E5130BA9E549B8AEE8DD201F
  */
 public class ModelElementTreeContentProvider extends TreeContentProviderBase {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
index 4fbd97d960ad2a2f51e5c493a15aa5ab18458d9f..cc7cf8ecc925d563ab021c768bcd6f3194c67f17 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
  * @author mou
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C99AE660759E352AE4D3A9E7BF0C5AD2
+ * @ConQAT.Rating GREEN Hash: D67E79EAD1793F7BA36881429E291991
  */
 public class MultiRootTreeContentProvider extends TreeContentProviderBase {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
index 1a5033fd7da97af4a51e2a75b83902e189d94fc2..7ff05069ddf3239017e8d22c491f5226b7f1c25e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/package.html
@@ -1,7 +1,7 @@
 <!--  
   $Id$
   @version $Rev$
-  @ConQAT.Rating YELLOW Hash: F5BA263532A5969D12FAEEF7BDC9B2AF
+  @ConQAT.Rating GREEN Hash: 10C27A17381EDF414F6F734941B5676D
 -->
 <body>
 Package for basic dialog classes