Experiment: Add "None" line style

- But this can be done already by setting line opacity to 0 - Canvas Block, Canvas Image, and Note already have a none border type so these are unnecessary
archimatetool · Dec 13, 2024 · de781cb · de781cb
1 parent 2473902
commit de781cb
Show file tree

Hide file tree

Showing 24 changed files with 89 additions and 46 deletions.
diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
@@ -26,6 +26,7 @@
 import com.archimatetool.editor.diagram.figures.TextPositionDelegate;
 import com.archimatetool.editor.ui.ColorFactory;
 import com.archimatetool.editor.utils.StringUtils;
+import com.archimatetool.model.IDiagramModelObject;
 
 
 /**
@@ -171,7 +172,7 @@ private void drawFigure(Graphics graphics, Color background) {
         drawIconImage(graphics, bounds);
 
         // Border
-        if(getBorderColor() != null) {
+        if(getBorderColor() != null && getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
             graphics.setAlpha(getLineAlpha());
             graphics.setForegroundColor(getBorderColor());
             graphics.drawRectangle(bounds.x, bounds.y, bounds.width, bounds.height);

diff --git a/com.archimatetool.editor/img/line-none.png b/com.archimatetool.editor/img/line-none.png
diff --git a/...tor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java b/...tor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java
@@ -27,7 +27,7 @@ public DiagramModelObjectLineStyleCommand(IDiagramModelObject dmo, int style) {
 
     @Override
     public boolean canExecute() {
-        return super.canExecute() && style >= IDiagramModelObject.LINE_STYLE_SOLID && style <= IDiagramModelObject.LINE_STYLE_DOTTED;
+        return super.canExecute() && style >= IDiagramModelObject.LINE_STYLE_SOLID && style <= IDiagramModelObject.LINE_STYLE_NONE;
     }
 
     /**

diff --git a/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java b/...imatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
@@ -129,6 +129,10 @@ protected void setLineWidth(Graphics graphics, int lineWidth, Rectangle bounds)
         getOwner().setLineWidth(graphics, lineWidth, bounds);
     }
 
+    protected int getLineStyle() {
+        return getOwner().getLineStyle();
+    }
+
     /**
      * Set line style
      * @param graphics

diff --git a/...himatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java b/...himatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
@@ -9,6 +9,8 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.graphics.Pattern;
 
+import com.archimatetool.model.IDiagramModelObject;
+
 
 
 /**
@@ -51,9 +53,11 @@ public void drawFigure(Graphics graphics) {
         disposeGradientPattern(graphics, gradient);
 
         // Outline
-        graphics.setAlpha(getLineAlpha());
-        graphics.setForegroundColor(getLineColor());
-        graphics.drawOval(bounds);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.setForegroundColor(getLineColor());
+            graphics.drawOval(bounds);
+        }
 
         // Image Icon
         Rectangle imageArea = new Rectangle(bounds.x + (bounds.width / 6), bounds.y + (bounds.height / 6),

diff --git a/...matetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java b/...matetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
@@ -9,6 +9,8 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.graphics.Pattern;
 
+import com.archimatetool.model.IDiagramModelObject;
+
 
 
 /**
@@ -52,9 +54,11 @@ public void drawFigure(Graphics graphics) {
         disposeGradientPattern(graphics, gradient);
 
         // Outline
-        graphics.setAlpha(getLineAlpha());
-        graphics.setForegroundColor(getLineColor());
-        graphics.drawRectangle(bounds);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.setForegroundColor(getLineColor());
+            graphics.drawRectangle(bounds);
+        }
 
         // Icon
         // getOwner().drawIconImage(graphics, bounds);

diff --git a/...l.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java b/...l.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
@@ -10,6 +10,8 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.swt.graphics.Pattern;
 
+import com.archimatetool.model.IDiagramModelObject;
+
 
 
 
@@ -57,9 +59,11 @@ public void drawFigure(Graphics graphics) {
         disposeGradientPattern(graphics, gradient);
 
         // Outline
-        graphics.setAlpha(getLineAlpha());
-        graphics.setForegroundColor(getLineColor());
-        graphics.drawRoundRectangle(bounds, fArc.width, fArc.height);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.setForegroundColor(getLineColor());
+            graphics.drawRoundRectangle(bounds, fArc.width, fArc.height);
+        }
 
         // Image Icon
         Rectangle imageArea = new Rectangle(bounds.x + 2, bounds.y + 2, bounds.width - 4, bounds.height - 4);

diff --git a/...etool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java b/...etool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
@@ -23,6 +23,7 @@
 import com.archimatetool.editor.ui.IArchiImages;
 import com.archimatetool.editor.ui.ImageFactory;
 import com.archimatetool.model.IDiagramModelImage;
+import com.archimatetool.model.IDiagramModelObject;
 
 
 /**
@@ -130,7 +131,7 @@ protected void paintFigure(Graphics graphics) {
         }
 
         // Border
-        if(getBorderColor() != null) {
+        if(getBorderColor() != null && getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
             graphics.setAlpha(getDiagramModelObject().getLineAlpha());
             graphics.setForegroundColor(getBorderColor());
             graphics.drawRectangle(bounds.x, bounds.y, bounds.width, bounds.height);

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java b/...rchimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
@@ -111,18 +111,20 @@ protected void drawFigure(Graphics graphics) {
             }
 
             // Line
-            graphics.setForegroundColor(getLineColor());
-            graphics.setAlpha(getLineAlpha());
-
-            Path path = new Path(null);
-            path.moveTo(bounds.x, bounds.y + tabHeight);
-            path.lineTo(bounds.x, bounds.y);
-            path.lineTo(bounds.x + tabWidth, bounds.y);
-            path.lineTo(bounds.x + tabWidth, bounds.y + tabHeight);
-            graphics.drawPath(path);
-            path.dispose();
-
-            graphics.drawRectangle(bounds.x, bounds.y + tabHeight, bounds.width, bounds.height - tabHeight);
+            if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+                graphics.setForegroundColor(getLineColor());
+                graphics.setAlpha(getLineAlpha());
+
+                Path path = new Path(null);
+                path.moveTo(bounds.x, bounds.y + tabHeight);
+                path.lineTo(bounds.x, bounds.y);
+                path.lineTo(bounds.x + tabWidth, bounds.y);
+                path.lineTo(bounds.x + tabWidth, bounds.y + tabHeight);
+                graphics.drawPath(path);
+                path.dispose();
+
+                graphics.drawRectangle(bounds.x, bounds.y + tabHeight, bounds.width, bounds.height - tabHeight);
+            }
         }
         else {
             graphics.setBackgroundColor(getFillColor());
@@ -139,9 +141,11 @@ protected void drawFigure(Graphics graphics) {
             }
 
             // Line
-            graphics.setForegroundColor(getLineColor());
-            graphics.setAlpha(getLineAlpha());
-            graphics.drawRectangle(bounds);
+            if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+                graphics.setForegroundColor(getLineColor());
+                graphics.setAlpha(getLineAlpha());
+                graphics.drawRectangle(bounds);
+            }
         }
 
         graphics.popState();

diff --git a/...archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java b/...archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
@@ -25,6 +25,7 @@
 import com.archimatetool.editor.diagram.figures.TextPositionDelegate;
 import com.archimatetool.editor.ui.textrender.TextRenderer;
 import com.archimatetool.model.IDiagramModelNote;
+import com.archimatetool.model.IDiagramModelObject;
 
 
 /**
@@ -151,7 +152,7 @@ protected void paintFigure(Graphics graphics) {
         // Icon
         drawIconImage(graphics, bounds);
 
-        if(getDiagramModelObject().getBorderType() != IDiagramModelNote.BORDER_NONE) {
+        if(getDiagramModelObject().getBorderType() != IDiagramModelNote.BORDER_NONE && getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
             graphics.setAlpha(getLineAlpha());
             graphics.setForegroundColor(getLineColor());
             graphics.drawPolygon(points);

diff --git a/...ditor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java b/...ditor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
@@ -13,6 +13,7 @@
 
 import com.archimatetool.editor.diagram.figures.AbstractTextControlContainerFigure;
 import com.archimatetool.editor.diagram.figures.FigureUtils;
+import com.archimatetool.model.IDiagramModelObject;
 
 
 /**
@@ -76,9 +77,11 @@ protected void drawFigure(Graphics graphics) {
         disposeGradientPattern(graphics, gradient);
 
         // Line
-        graphics.setAlpha(getLineAlpha());
-        graphics.setForegroundColor(getLineColor());
-        graphics.drawPolygon(points);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.setForegroundColor(getLineColor());
+            graphics.drawPolygon(points);
+        }
 
         // Image Icon
         Rectangle imageArea = new Rectangle(bounds.x + FLANGE / 2, bounds.y + FLANGE / 2, bounds.width - FLANGE, bounds.height - FLANGE);

diff --git a/...matetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java b/...matetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
@@ -18,6 +18,7 @@
 
 import com.archimatetool.editor.diagram.figures.AbstractTextControlContainerFigure;
 import com.archimatetool.editor.diagram.figures.FigureUtils;
+import com.archimatetool.model.IDiagramModelObject;
 import com.archimatetool.model.ITextAlignment;
 import com.archimatetool.model.ITextPosition;
 
@@ -131,17 +132,21 @@ protected void drawFigure(Graphics graphics) {
                 drawIconImage(graphics, bounds);
             }
 
-            graphics.setAlpha(getLineAlpha());
-            graphics.drawLine(bounds.x, bounds.y, bounds.x, bounds.y + tabHeight);
-            graphics.drawLine(bounds.x, bounds.y, bounds.x + tabWidth, bounds.y);
-            graphics.drawLine(bounds.x + tabWidth, bounds.y, bounds.x + tabWidth, bounds.y + tabHeight);
+            if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+                graphics.setAlpha(getLineAlpha());
+                graphics.drawLine(bounds.x, bounds.y, bounds.x, bounds.y + tabHeight);
+                graphics.drawLine(bounds.x, bounds.y, bounds.x + tabWidth, bounds.y);
+                graphics.drawLine(bounds.x + tabWidth, bounds.y, bounds.x + tabWidth, bounds.y + tabHeight);
+            }
         }
 
         disposeGradientPattern(graphics, gradient);
 
         // Outlines
-        graphics.setAlpha(getLineAlpha());
-        graphics.drawPolygon(mainRectangle);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.drawPolygon(mainRectangle);
+        }
 
         graphics.popState();
 

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java b/...rchimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
@@ -12,6 +12,7 @@
 
 import com.archimatetool.editor.diagram.figures.AbstractTextControlContainerFigure;
 import com.archimatetool.editor.utils.StringUtils;
+import com.archimatetool.model.IDiagramModelObject;
 import com.archimatetool.model.ISketchModelSticky;
 
 
@@ -65,9 +66,11 @@ protected void drawFigure(Graphics graphics) {
         drawIconImage(graphics, bounds);
 
         // Outline
-        graphics.setAlpha(getLineAlpha());
-        graphics.setForegroundColor(getLineColor());
-        graphics.drawRectangle(bounds.x, bounds.y, bounds.width, bounds.height);
+        if(getLineStyle() != IDiagramModelObject.LINE_STYLE_NONE) {
+            graphics.setAlpha(getLineAlpha());
+            graphics.setForegroundColor(getLineColor());
+            graphics.drawRectangle(bounds.x, bounds.y, bounds.width, bounds.height);
+        }
 
         graphics.popState();
     }

diff --git a/...rchimatetool.editor/src/com/archimatetool/editor/propertysections/LineStyleComposite.java b/...rchimatetool.editor/src/com/archimatetool/editor/propertysections/LineStyleComposite.java
@@ -62,6 +62,7 @@ private void createControls(Composite parent) {
             menuManager.add(createAction(Messages.LineStyleComposite_1, IDiagramModelObject.LINE_STYLE_SOLID, IArchiImages.ImageFactory.getImageDescriptor(IArchiImages.LINE_SOLID)));
             menuManager.add(createAction(Messages.LineStyleComposite_2, IDiagramModelObject.LINE_STYLE_DASHED, IArchiImages.ImageFactory.getImageDescriptor(IArchiImages.LINE_DASHED)));
             menuManager.add(createAction(Messages.LineStyleComposite_3, IDiagramModelObject.LINE_STYLE_DOTTED, IArchiImages.ImageFactory.getImageDescriptor(IArchiImages.LINE_DOTTED)));
+            menuManager.add(createAction(Messages.LineStyleComposite_4, IDiagramModelObject.LINE_STYLE_NONE, IArchiImages.ImageFactory.getImageDescriptor(IArchiImages.LINE_NONE)));
 
             Menu menu = menuManager.createContextMenu(button.getShell());
             Rectangle buttonBounds = button.getBounds();
@@ -133,6 +134,9 @@ void updateControl() {
             case IDiagramModelObject.LINE_STYLE_DOTTED:
                 button.setImage(IArchiImages.ImageFactory.getImage(IArchiImages.LINE_DOTTED));
                 break;
+            case IDiagramModelObject.LINE_STYLE_NONE:
+                button.setImage(IArchiImages.ImageFactory.getImage(IArchiImages.LINE_NONE));
+                break;
         }
 
         button.setEnabled(!section.isLocked(dmo));

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/Messages.java
@@ -255,6 +255,8 @@ public class Messages extends NLS {
 
     public static String LineStyleComposite_3;
 
+    public static String LineStyleComposite_4;
+
     public static String LineWidthSection_0;
 
     public static String LineWidthSection_1;

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/messages.properties
@@ -133,6 +133,7 @@ LineStyleComposite_0=Line Style:
 LineStyleComposite_1=Solid
 LineStyleComposite_2=Dashed
 LineStyleComposite_3=Dotted
+LineStyleComposite_4=None
 LineWidthSection_0=Line Width:
 LineWidthSection_1=Normal
 LineWidthSection_2=Medium

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/ui/IArchiImages.java b/com.archimatetool.editor/src/com/archimatetool/editor/ui/IArchiImages.java
@@ -192,6 +192,7 @@ public interface IArchiImages {
     String LINE_SOLID = IMGPATH + "line-solid.png";
     String LINE_DASHED = IMGPATH + "line-dashed.png";
     String LINE_DOTTED = IMGPATH + "line-dotted.png";
+    String LINE_NONE = IMGPATH + "line-none.png";
 
     String ARROW_SOURCE_FILL = IMGPATH + "arrow-source-fill.png";
     String ARROW_TARGET_FILL = IMGPATH + "arrow-target-fill.png";

diff --git a/com.archimatetool.help/help/Text/properties_canvas_block.html b/com.archimatetool.help/help/Text/properties_canvas_block.html
@@ -92,7 +92,7 @@ <h2>Canvas Block</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
       <tr>
         <td><strong>Text Alignment:</strong></td>

diff --git a/com.archimatetool.help/help/Text/properties_canvas_image.html b/com.archimatetool.help/help/Text/properties_canvas_image.html
@@ -75,7 +75,7 @@ <h2>Canvas Image</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
     </table>
 

diff --git a/com.archimatetool.help/help/Text/properties_element_appearance.html b/com.archimatetool.help/help/Text/properties_element_appearance.html
@@ -50,7 +50,7 @@ <h2>Element Appearance Properties</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
       <tr>
         <td><strong>Icon Colour:</strong></td>

diff --git a/com.archimatetool.help/help/Text/properties_group.html b/com.archimatetool.help/help/Text/properties_group.html
@@ -80,7 +80,7 @@ <h2>Group Properties</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
       <tr>
         <td><strong>Border:</strong></td>

diff --git a/com.archimatetool.help/help/Text/properties_note.html b/com.archimatetool.help/help/Text/properties_note.html
@@ -66,7 +66,7 @@ <h2>Note Properties</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
       <tr>
         <td><strong>Border:</strong></td>

diff --git a/com.archimatetool.help/help/Text/properties_viewref.html b/com.archimatetool.help/help/Text/properties_viewref.html
@@ -72,7 +72,7 @@ <h2>View Reference Properties</h2>
       </tr>
       <tr>
         <td><strong>Line Style:</strong></td>
-        <td>Set the line style of the figure. Options are "Solid", "Dashed" and "Dotted".</td>
+        <td>Set the line style of the figure. Options are "Solid", "Dashed", "Dotted" and "None".</td>
       </tr>
       <tr>
         <td><strong>Text Alignment:</strong></td>

diff --git a/com.archimatetool.model/src/com/archimatetool/model/IDiagramModelObject.java b/com.archimatetool.model/src/com/archimatetool/model/IDiagramModelObject.java
@@ -50,6 +50,7 @@ public interface IDiagramModelObject extends IConnectable, IFontAttribute, ILine
     int LINE_STYLE_SOLID = 0;
     int LINE_STYLE_DASHED = 1;
     int LINE_STYLE_DOTTED = 2;
+    int LINE_STYLE_NONE = 3;
     int FEATURE_LINE_STYLE_DEFAULT = LINE_STYLE_DEFAULT;
 
     /**