diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
index 1444ceeabb5c58e56001d338a4bf3bd1737b064c..7ed4357b37c33301de89f8ff2f597e3c2cc4ade3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
@@ -33,7 +33,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: CEB37EC45D3FB317BEF8282765C22C0A
+ * @ConQAT.Rating YELLOW Hash: F25E7B799F0FC1D19E66F25943E8BF8B
  */
 public abstract class ConnectionEditPartBase<T extends ILayoutedModelElement & IConnection>
 		extends AbstractConnectionEditPart {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
index d9bb67c5098f1a24535f1096b310fc6729c7cc89..eb9808e56c77ff0813628042e140dcbeaab65592 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
@@ -53,7 +53,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 33691B003B390F6576C82DFB32395F1C
+ * @ConQAT.Rating YELLOW Hash: 235F807E331B0D3976B0707631869C69
  */
 public abstract class ConnectorEditPartBase<T extends ILayoutedModelElement & IConnector & INamedCommentedElement>
 		extends PositionedEditPartBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
index 8c7aaa0e5259137ef1785568b3def798bd81a6a4..0918d2f61f1a45c99be396825005d7aeabf39462 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
@@ -57,7 +57,7 @@ import org.fortiss.tooling.base.ui.utils.SnapToGridUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 76BF89DC0EFA9511DDF95CA4EC32C074
+ * @ConQAT.Rating YELLOW Hash: 8942A6982298A065FA8B7D45B0BAC968
  */
 public abstract class DiagramEditPartBase<T extends EObject> extends
 		GraphicalEditPartBase<T> implements NodeEditPart {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
index 667329f889a639956b77c89f33b237fced8f76ff..0cf1d6b52642e2386728dfeb0cce5cd55b3c1c4e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
@@ -57,7 +57,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: D6B33EFB704B0CA151E1C945B5BC48C6
+ * @ConQAT.Rating YELLOW Hash: 3529BFB1E37557EADBC89E1C715C63D8
  */
 public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INamedCommentedElement>
 		extends PositionedEditPartBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
index a8712a54566958a1bbb3d25d7692df282b8e12c4..b1ce980470c852d62b0445630a47979db360a37c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gef.editparts.ScalableRootEditPart;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 6AE34957657F23D48142F8C130CCC547
+ * @ConQAT.Rating YELLOW Hash: 2E560FF435B9B183DE5682228BE86FB9
  */
 public class ExtendedLayerRootEditPart extends ScalableRootEditPart {
 	/** The node layer ID. */
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
index 835e545a49b445d1fbb7299f671613a7d0c06117..c1128e1732eeaa588c16fd2275f8963203cbc36d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
@@ -30,7 +30,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
  * 
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: D87ADE227517E67155D136BF55FCFA93
  */
 public abstract class FreeConnectorEditPartBase<T extends ILayoutedModelElement & IConnector & INamedCommentedElement>
 		extends ConnectorEditPartBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
index 0ae93d2a434ef5a5fd2ce86ec4cc6f0241f507cd..060cf6bb9080d20559d1291d687f0d3176ce13ce 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
@@ -35,7 +35,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 8835616CDDA5F811EE493732151D585F
+ * @ConQAT.Rating YELLOW Hash: 87A0587A5F17E72695DD8EEB81FFC058
  */
 public abstract class GraphicalEditPartBase<T extends EObject> extends
 		AbstractGraphicalEditPart {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
index bbe163aabc261a45b2ab742337c0b1c5e07d94a8..91cbdf4d31dc12a9047e85a5b86c006a901d06a2 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/LayoutedConnectionEditPartBase.java
@@ -52,7 +52,7 @@ import org.fortiss.tooling.base.ui.utils.LayoutDataUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 4528B935FD404A834CBD215E46A1BFC1
+ * @ConQAT.Rating YELLOW Hash: 1AEE2F4A55EE4F26A50E3BFD1B531AD6
  */
 public abstract class LayoutedConnectionEditPartBase<T extends ConnectionSegmentBase>
 		extends ConnectionEditPartBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
index 3b54ca2c5a76eef7c9c106791249b89c66878388..1f320fa58d589e47090181a4aeb1245e3df4a718 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
@@ -61,7 +61,7 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: D6B33EFB704B0CA151E1C945B5BC48C6
+ * @ConQAT.Rating YELLOW Hash: 8A913D00C0CD04E7FF8099F83F8A1504
  */
 public abstract class PositionedEditPartBase<T extends ILayoutedModelElement>
 		extends GraphicalEditPartBase<T> implements NodeEditPart {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
index dea757f0eb7df8d16f837cc76fecfa905c86bfcb..bd6170d7ec7c6a51783ac0f067291aa4601e5f8b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
@@ -33,7 +33,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: D40B88A14F1DE4B7C2097C8D6163DC11
  */
 public abstract class StickyConnectorEditPartBase<T extends ILayoutedModelElement & IConnector & INamedCommentedElement>
 		extends ConnectorEditPartBase<T> {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
index c5f54c7fd822f5c953a648c7905bf9cc0ccc4bc0..cfa7f3b7be6f5e8cc9c5cc8b3d304fde7ce4e8d1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
@@ -40,7 +40,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: CF233E62948846C66408FEE3848CFBDE
+ * @ConQAT.Rating YELLOW Hash: 44874F944EB65D31ADD222EFEBE4E7F6
  */
 public class PrettyInsetEllipse extends Shape {
 
@@ -113,7 +113,7 @@ public class PrettyInsetEllipse extends Shape {
 
 	/** Returns a copy of the bounds cropped by the insets. */
 	protected Rectangle getCroppedBounds() {
-		return bounds.getCropped(insets);
+		return bounds.getShrinked(insets);
 	}
 
 	/**
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
index f60cc2ff4f2eb319df8b3f6f6605af6c897b5cb6..c086bcfacd56bd89df0f8642821eca7de28d91fd 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 3FE067E8F618DE4394D10876405951A7
+ * @ConQAT.Rating YELLOW Hash: C452794B56B9A854A801D112102E7571
  */
 public class PrettyRoundedRectangle extends Shape {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
index 0b010137468197989e15116fc679afb31258de82..1889665b679331a5a28ab65e95fc08fa637f420f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.graphics.Image;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: FCEB3C4E0D8E382EF77C10A655B5D26E
  */
 public class TransparentLabel extends Label {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionBendpointEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionBendpointEditPolicy.java
index fcb4466d4299bb58b3c2c73eaa0663b18f535af5..ee4333133720d1bf70c8e21e6f13b6122b74e4bd 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionBendpointEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConnectionBendpointEditPolicy.java
@@ -36,7 +36,7 @@ import org.fortiss.tooling.base.ui.utils.SnapToGridUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: E77983D22C4E49D977F8A4BC13E34D85
+ * @ConQAT.Rating YELLOW Hash: CD81D84A4C9A21F724D234FE91E451A5
  */
 public class ConnectionBendpointEditPolicy<T extends ILayoutedModelElement & IConnection>
 		extends BendpointEditPolicy implements IPointLayouter {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConstrainedNonResizableEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConstrainedNonResizableEditPolicy.java
index 115982f01d7362fdae643613c7b469f2f4f4f090..9b08218cb10c1a2efaeb491b6732e5c50086cd3f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConstrainedNonResizableEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ConstrainedNonResizableEditPolicy.java
@@ -47,7 +47,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 4A355EC6FDC855CE9E728649BD5D8B6B
+ * @ConQAT.Rating YELLOW Hash: FC9D74B52F6CC2BB215327823B90DB25
  */
 public class ConstrainedNonResizableEditPolicy<T extends ILayoutedModelElement & INamedCommentedElement>
 		extends NonResizableEditPolicy {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
index f7a0d382d618cbbb18d9cae5c6cc6ca873cb1a48..84f6ab58d57938d4337223b4314882ddb30d1007 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
@@ -35,7 +35,7 @@ import org.fortiss.tooling.base.ui.utils.ZoomUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: EDE430BDF6AF2557B61A010B20999456
+ * @ConQAT.Rating YELLOW Hash: 340150964BEB983800C6C07A0BE70B2D
  */
 public class DiagramLayoutEditPolicy extends LayoutEditPolicyBase {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
index 69a9a40ad21b1103623c971e3bf7b3ebd1d03dc9..ca3faad662386abf3b5141d878321d21683e6110 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
@@ -36,7 +36,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 575F7A8F72757299806077E13181D372
+ * @ConQAT.Rating YELLOW Hash: 24C47B8F82827769F3E89593ED821AD8
  */
 public class ElementLayoutEditPolicy<T extends ILayoutedModelElement & INamedCommentedElement>
 		extends LayoutEditPolicyBase {
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/FreeResizableEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/FreeResizableEditPolicy.java
index 91e2e30bf4a819d91e93bfb065f6cc381acba414..1ce1d0654200dfdb0c3094b27e9144d8f9b86e72 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/FreeResizableEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/FreeResizableEditPolicy.java
@@ -36,7 +36,7 @@ import org.fortiss.tooling.base.ui.utils.RectangleLayoutUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 8F9361223B2D04A638954A22CE574C86
+ * @ConQAT.Rating YELLOW Hash: 71337F264E99FD12D898B1A84F7C6DCD
  */
 public class FreeResizableEditPolicy extends ResizableEditPolicy {
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
index c21f0d460eabb39a29131310cf972d367f526a29..0906329a4ea94ca79038c39850e57d89cdbb0308 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
@@ -35,7 +35,7 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 88B39E781AA009BE850045A046CDC23E
+ * @ConQAT.Rating YELLOW Hash: 71E7A1AC3352815B48CA1B2600A4919C
  */
 public final class RemoveEditPolicy extends ComponentEditPolicy {