Rework diagram element moveability check. Fixes #2544 (#2545)

osate · Dec 9, 2020 · 111f091 · 111f091
1 parent f76409f
commit 111f091
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/ge/org.osate.ge/src/org/osate/ge/graphics/internal/AgeShape.java b/ge/org.osate.ge/src/org/osate/ge/graphics/internal/AgeShape.java
@@ -29,10 +29,6 @@
  * Marker for graphics which will be used to represent shapes. Not public API.
  */
 public interface AgeShape extends Graphic {
-	default boolean isMoveable() {
-		return true;
-	}
-
 	default boolean isResizeable() {
 		return true;
 	}

diff --git a/ge/org.osate.ge/src/org/osate/ge/graphics/internal/Label.java b/ge/org.osate.ge/src/org/osate/ge/graphics/internal/Label.java
@@ -24,11 +24,6 @@
 package org.osate.ge.graphics.internal;
 
 public class Label implements AgeShape {
-	@Override
-	public boolean isMoveable() {
-		return false;
-	}
-
 	@Override
 	public boolean isResizeable() {
 		return false;

diff --git a/ge/org.osate.ge/src/org/osate/ge/internal/diagram/runtime/DiagramElementPredicates.java b/ge/org.osate.ge/src/org/osate/ge/internal/diagram/runtime/DiagramElementPredicates.java
@@ -36,7 +36,9 @@ public static boolean isResizeable(final DiagramElement de) {
 
 	public static boolean isMoveable(final DiagramElement de) {
 		final Graphic graphic = de.getGraphic();
-		return graphic instanceof AgeShape && ((AgeShape)graphic).isMoveable();
+		final boolean shapeSecondaryLabel = graphic instanceof Label && de.getParent() instanceof DiagramElement
+				&& ((DiagramElement) de.getParent()).getGraphic() instanceof AgeShape;
+		return graphic instanceof AgeShape && !shapeSecondaryLabel;
 	}
 
 	public static boolean isUndocked(final DiagramElement de) {