Adjust small icon figure position according to line width

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramModelReferenceFigure.java

@@ -62,7 +62,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ApplicationComponentFigure.java

@@ -157,7 +157,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 15, bounds.y + 19);
+        return new Point(bounds.x + bounds.width - 14 - getLineWidth(), bounds.y + 19);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ArtifactFigure.java

@@ -146,7 +146,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 16, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 15 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AssessmentFigure.java

@@ -147,7 +147,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 15, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 14 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessActorFigure.java

@@ -143,7 +143,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 13, bounds.y + 4);
+        return new Point(bounds.x + bounds.width - 10 - getLineWidth(), bounds.y + 4);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/BusinessRoleFigure.java

@@ -77,7 +77,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 18, bounds.y + 7);
+        return new Point(bounds.getRight().x - 17 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CapabilityFigure.java

@@ -148,7 +148,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 17, bounds.y + 5);
+        return new Point(bounds.getRight().x - 16 - getLineWidth(), bounds.y + 5);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CollaborationFigure.java

@@ -124,7 +124,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CommunicationNetworkFigure.java

@@ -151,7 +151,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 14);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 14);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ConstraintFigure.java

@@ -68,7 +68,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/CourseOfActionFigure.java

@@ -219,7 +219,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 17, bounds.y + 3);
+        return new Point(bounds.getRight().x - 16 - getLineWidth(), bounds.y + 2 + getLineWidth());
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java

@@ -126,7 +126,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeviceFigure.java

@@ -133,7 +133,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 17, bounds.y + 5);
+        return new Point(bounds.x + bounds.width - 15 - getLineWidth(), bounds.y + 5);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DistributionNetworkFigure.java

@@ -212,7 +212,7 @@ protected void drawIcon(Graphics graphics) {
 
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 12);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/DriverFigure.java

@@ -168,7 +168,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EquipmentFigure.java

@@ -234,7 +234,7 @@ private void drawIconCog(Graphics graphics, Point center, int segments, int r1,
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 19, bounds.y + 17);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 17);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/EventFigure.java

@@ -135,7 +135,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FacilityFigure.java

@@ -158,7 +158,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 20, bounds.y + 17);
+        return new Point(bounds.getRight().x - 19 - getLineWidth(), bounds.y + 17);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/FunctionFigure.java

@@ -165,7 +165,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 19);
+        return new Point(bounds.x + bounds.width - 16 - getLineWidth(), bounds.y + 19);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GapFigure.java

@@ -130,7 +130,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GoalFigure.java

@@ -127,7 +127,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java

@@ -234,7 +234,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InteractionFigure.java

@@ -153,7 +153,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 13, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 11 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/InterfaceFigure.java

@@ -123,7 +123,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 14, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 13 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/LocationFigure.java

@@ -139,7 +139,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 10, bounds.y + 20);
+        return new Point(bounds.x + bounds.width - 8 - getLineWidth(), bounds.y + 20);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MaterialFigure.java

@@ -165,7 +165,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 12, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 11 - getLineWidth(), bounds.y + 12);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/MeaningFigure.java

@@ -133,7 +133,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/NodeFigure.java

@@ -87,7 +87,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ObjectFigure.java

@@ -134,7 +134,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/OutcomeFigure.java

@@ -183,7 +183,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 25, bounds.y + 9);
+        return new Point(bounds.x + bounds.width - 24 - getLineWidth(), bounds.y + 9);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PathFigure.java

@@ -95,6 +95,6 @@ protected void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 12);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 12);
     }
 }

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PlateauFigure.java

@@ -110,7 +110,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 13);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 13);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/PrincipleFigure.java

@@ -172,7 +172,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigure.java

@@ -92,7 +92,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 11);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 11);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ProductFigure.java

@@ -137,7 +137,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/RequirementFigure.java

@@ -66,7 +66,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 8);
+        return new Point(bounds.x + bounds.width - 18 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ResourceFigure.java

@@ -200,7 +200,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 20, bounds.y + 7);
+        return new Point(bounds.getRight().x - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ServiceFigure.java

@@ -68,7 +68,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/StakeholderFigure.java

@@ -75,7 +75,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 21, bounds.y + 9);
+        return new Point(bounds.x + bounds.width - 20 - getLineWidth(), bounds.y + 9);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/SystemSoftwareFigure.java

@@ -121,7 +121,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return getDiagramModelArchimateObject().getType() == 0 ? new Point(bounds.x + bounds.width - 18, bounds.y + 8) : new Point(bounds.x + bounds.width - 31, bounds.y + 20);
+        return new Point(bounds.x + bounds.width - 16 - getLineWidth(), bounds.y + 8);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueFigure.java

@@ -128,7 +128,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds().getCopy();
-        return new Point(bounds.x + bounds.width - 20, bounds.y + 7);
+        return new Point(bounds.x + bounds.width - 19 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/ValueStreamFigure.java

@@ -157,7 +157,7 @@ protected void drawIcon(Graphics graphics) {
      */
     protected Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.getRight().x - 19, bounds.y + 7);
+        return new Point(bounds.getRight().x - 18 - getLineWidth(), bounds.y + 7);
     }
 
     @Override

com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/WorkPackageFigure.java

@@ -184,7 +184,7 @@ private void drawIcon(Graphics graphics) {
      */
     private Point getIconOrigin() {
         Rectangle bounds = getBounds();
-        return new Point(bounds.x + bounds.width - 18, bounds.y + 6);
+        return new Point(bounds.x + bounds.width - 17 - getLineWidth(), bounds.y + 6);
     }
 
     @Override