Add AbstractDiagramModelObjectFigure#getLineWidth convenience method

archimatetool · Aug 20, 2023 · 4d8422f · 4d8422f
1 parent bda642a
commit 4d8422f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java
@@ -161,7 +161,7 @@ protected void paintFigure(Graphics graphics) {
         if(getBorderColor() != null) {
             graphics.setAlpha(getLineAlpha());
 
-            float lineOffset = (float)getDiagramModelObject().getLineWidth() / 2;
+            float lineOffset = (float)getLineWidth() / 2;
 
             graphics.setForegroundColor(ColorFactory.getLighterColor(getBorderColor(), 0.82f));
             Path path = new Path(null);

diff --git a/...editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java b/...editor/src/com/archimatetool/editor/diagram/figures/AbstractDiagramModelObjectFigure.java
@@ -102,7 +102,7 @@ protected void drawFigure(Graphics graphics) {
      * @param bounds The bounds of the object
      */
     protected void setLineWidth(Graphics graphics, Rectangle bounds) {
-        setLineWidth(graphics, getDiagramModelObject().getLineWidth(), bounds);
+        setLineWidth(graphics, getLineWidth(), bounds);
     }
 
     /**
@@ -257,6 +257,10 @@ protected int getGradient() {
         return fDiagramModelObject.getGradient();
     }
 
+    protected int getLineWidth() {
+        return fDiagramModelObject.getLineWidth();
+    }
+
     @Override
     public void updateIconImage() {
         if(getIconicDelegate() != null) {

diff --git a/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java b/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
@@ -103,6 +103,13 @@ protected void setDisabledState(Graphics graphics) {
         getOwner().setDisabledState(graphics);
     }
 
+    /**
+     * @return The owner's line width
+     */
+    protected int getLineWidth() {
+        return getOwner().getLineWidth();
+    }
+
     /**
      * Set the line width to that in the diagram model and compensate the figure bounds width and height for this line width and translate the graphics instance
      * @param graphics The graphics instance

diff --git a/...etool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java b/...etool.editor/src/com/archimatetool/editor/diagram/figures/elements/DeliverableFigure.java
@@ -56,7 +56,7 @@ protected void drawFigure(Graphics graphics) {
             setDisabledState(graphics);
         }
 
-        Path path = getFigurePath(8, bounds, (float)getDiagramModelObject().getLineWidth() / 2);
+        Path path = getFigurePath(8, bounds, (float)getLineWidth() / 2);
 
         // Main Fill
         graphics.setBackgroundColor(getFillColor());

diff --git a/...l.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java b/...l.editor/src/com/archimatetool/editor/diagram/figures/elements/ProcessFigureDelegate.java
@@ -56,7 +56,7 @@ public void drawFigure(Graphics graphics) {
         float y1 = bounds.y + (bounds.height / 5);
         float y2 = bounds.y + bounds.height - (bounds.height / 5);
 
-        float lineOffset = (float)getOwner().getDiagramModelObject().getLineWidth() / 2;
+        float lineOffset = (float)getLineWidth() / 2;
 
         path.moveTo(bounds.x, y1);
         path.lineTo(x1, y1);

diff --git a/...ol.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java b/...ol.editor/src/com/archimatetool/editor/diagram/figures/elements/RepresentationFigure.java
@@ -52,7 +52,7 @@ public void drawFigure(Graphics graphics) {
             setDisabledState(graphics);
         }
 
-        Path path = getFigurePath(6, bounds, (float)getDiagramModelObject().getLineWidth() / 2);
+        Path path = getFigurePath(6, bounds, (float)getLineWidth() / 2);
 
         // Main Fill
         graphics.setBackgroundColor(getFillColor());

diff --git a/...atetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/SketchActorFigure.java b/...atetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/SketchActorFigure.java
@@ -39,7 +39,7 @@ protected void paintFigure(Graphics graphics) {
         graphics.setAntialias(SWT.ON);
         Rectangle bounds = getBounds().getCopy();
 
-        graphics.setLineWidth(getDiagramModelObject().getLineWidth() + 1);
+        graphics.setLineWidth(getLineWidth() + 1);
 
         bounds.height -= getLabel().getPreferredSize().height;