refs 454

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConnectorConnectionCompositorBase.java

@@ -23,6 +23,7 @@ import org.fortiss.tooling.base.model.base.ConnectorBase;
 import org.fortiss.tooling.base.model.base.EntryConnectorBase;
 import org.fortiss.tooling.base.model.base.ExitConnectorBase;
 import org.fortiss.tooling.base.model.base.HierarchicElementBase;
+import org.fortiss.tooling.base.model.element.IConnection;
 import org.fortiss.tooling.base.model.element.IConnector;
 import org.fortiss.tooling.base.model.element.IHierarchicElement;
 import org.fortiss.tooling.base.ui.dnd.gef.ConnectionDragContext;
@@ -38,7 +39,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: BF580E0E9288B911232B85705FA1BA19
+ * @ConQAT.Rating YELLOW Hash: 1C61F6AB68C85978EAC5B75371A69DED
  */
 public abstract class ConnectorConnectionCompositorBase<HE extends IHierarchicElement, S extends IConnector, T extends IConnector>
 		implements IConnectionCompositor<HE, S, T> {
@@ -258,6 +259,20 @@ public abstract class ConnectorConnectionCompositorBase<HE extends IHierarchicEl
 	/** Base implementation returns true by default */
 	public abstract boolean canDisconnectSpecific(EObject connection);
 
+	/** {@inheritDoc} */
+	@Override
+	public boolean disconnect(EObject connection) {
+		if (connection instanceof IConnection) {
+			IConnection conn = (IConnection) connection;
+			// this order is important !
+			conn.setOwner(null);
+			conn.setSource(null);
+			conn.setTarget(null);
+			return true;
+		}
+		return false;
+	}
+
 	/** {@inheritDoc} */
 	@Override
 	public boolean canReconnect(EObject connection, S source, T target,

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java

@@ -63,7 +63,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 4A10EBF567396F8EACF716453CF6AF04
+ * @ConQAT.Rating YELLOW Hash: 2D3DCF9F19F2F3F140D4DEDA789661BB
  */
 public abstract class PositionedEditPartBase<T extends ILayoutedModelElement>
 		extends GraphicalEditPartBase<T> implements NodeEditPart {
@@ -167,7 +167,7 @@ public abstract class PositionedEditPartBase<T extends ILayoutedModelElement>
 	/** {@inheritDoc} */
 	@Override
 	protected void refreshVisuals() {
-		if (baseFigure != null) {
+		if (baseFigure != null && baseFigure.getParent() != null) {
 			Rectangle baseBounds = determineBaseFigureBounds();
 			baseFigure.setBounds(baseBounds);
 			baseFigure.getParent().setConstraint(baseFigure, baseBounds);
@@ -178,14 +178,14 @@ public abstract class PositionedEditPartBase<T extends ILayoutedModelElement>
 							.getWrappedNameDescription(getModel())));
 		}
 
-		if (labelFigure != null) {
+		if (labelFigure != null && labelFigure.getParent() != null) {
 			labelFigure.setText(determineLabelFigureText());
 			Rectangle labelBounds = determineLabelFigureBounds();
 			labelFigure.setBounds(labelBounds);
 			labelFigure.getParent().setConstraint(labelFigure, labelBounds);
 		}
 
-		if (decorationFigure != null) {
+		if (decorationFigure != null && decorationFigure.getParent() != null) {
 			Rectangle decorationBounds = determineDecorationFigureBounds();
 			decorationFigure.setBounds(decorationBounds);
 			decorationFigure.getParent().setConstraint(decorationFigure,