From ce8b8b58b5da8101330fed7ab801d0735dedb2da Mon Sep 17 00:00:00 2001
From: Phillipus <p.beauvoir@dadabeatnik.com>
Date: Sat, 14 Dec 2024 16:13:27 +0000
Subject: [PATCH] Add "None" line style

- Canvas Block, Canvas Image, and Note already have a none border type so these are unnecessary
---
 .../canvas/figures/CanvasBlockFigure.java     |   3 +-
 com.archimatetool.editor/img/line-none.png    | Bin 0 -> 1931 bytes
 .../DiagramModelObjectLineStyleCommand.java   |   2 +-
 .../figures/AbstractFigureDelegate.java       |   4 +++
 .../figures/EllipseFigureDelegate.java        |  10 ++++--
 .../figures/RectangleFigureDelegate.java      |  10 ++++--
 .../RoundedRectangleFigureDelegate.java       |  10 ++++--
 .../figures/diagram/DiagramImageFigure.java   |   3 +-
 .../diagram/figures/diagram/GroupFigure.java  |  34 ++++++++++--------
 .../diagram/figures/diagram/NoteFigure.java   |   3 +-
 .../elements/AbstractMotivationFigure.java    |   9 +++--
 .../figures/elements/GroupingFigure.java      |  17 +++++----
 .../diagram/sketch/figures/StickyFigure.java  |   9 +++--
 .../propertysections/LineStyleComposite.java  |   4 +++
 .../editor/propertysections/Messages.java     |   2 ++
 .../propertysections/messages.properties      |   1 +
 .../archimatetool/editor/ui/IArchiImages.java |   1 +
 .../help/Text/properties_canvas_block.html    |   2 +-
 .../help/Text/properties_canvas_image.html    |   2 +-
 .../Text/properties_element_appearance.html   |   2 +-
 .../help/Text/properties_group.html           |   2 +-
 .../help/Text/properties_note.html            |   2 +-
 .../help/Text/properties_viewref.html         |   2 +-
 .../model/IDiagramModelObject.java            |   1 +
 24 files changed, 89 insertions(+), 46 deletions(-)
 create mode 100644 com.archimatetool.editor/img/line-none.png

diff --git a/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java b/com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasBlockFigure.java
index b1ce6bb87..7603e1568 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..b531aec81a6f8bdf803ba04ce8bc8fb6e8ab22ca
GIT binary patch
literal 1931
zcmaJ?Yfuwc6kaMtK~SrRFRIHTRZ+5e@LUNB1Oy?JLa30LDoe5nE6MJf-IxW%Q42-E
z;-FCLl(wMO3PM#{9T5d8S^)>eT5+tlfEKk{r=wVl1EakgkcUuzY_j)$-}%nD=iGC4
zdu+@KCx_V%5Cl0zMkwOIKMbD96YRim_U4uu5M+CRR3&nW%4keO8%4O5P9a3RkpVaa
z1uo+mT$4s{a0;O(DLL|YO&tQ0S~;@HM=4e^p+qVfkzpd@Gh$Slj5JMv7FibL5XfUd
zz({a7%o`09i}7;As*8blVH-tYD}_swBZ<mbIFvRKu#d<`Bu0W9;6RgBhs7zv2aLf=
zj-+xNgQ2L!Vi8$nBHE-!B>@2es91_hrCxyH#immn&U;a;yCBi8p&(d|iDWpEreHx6
zPod4696<mM4~TQ5Zb+SC2aXRCfeHvJ5sA^^bb=@Uhb|za=u9fj(QGQs3?5*Fi$Qpl
zAxPiYCOpoJMOG@`Og9=w9E0V;)`LV0By~hguN<(dbcR6V2$nXRG(^~Xg5un*nGo`V
zMH+EE5lv8fE>(_5d|m@qky>G2CLP)rgbZe(5(yLuTn~d1hcG$fCqX4cR!L(*LaMP?
zk|zv_3ereWEKnWvHUuUO0|!F1f}ym5HpPQ$O@Pp?z6R@nSurK81(57DC^9rO)<o+_
z1Hjn06(MkBSg5Zgz}MGHD(aU3MZ<tCsY_Sj9AHVsQg1Jb)Jx*6lK5agewdF;Z56c=
zK^tgs4u1nxxW{lHAS;zv1j%x=Dc!o&f4Sp{b^WXUrGd2GY8bZG7Q;0{uH^`0qP1oX
zp|$!2a{VYv>o^N;B7*gxta2n+rz1gC(qYgrq@E&7utX#gi~L6#SyBlgIOd_yfw)ki
z%U%T*h>i+9&`KEAmcXum541a&8|dKR0E@xVLr`Gen809(xcbd42(sBsf>Mks0R$~9
zFc(~m3JG@3S$1699Cs)z&t+<xXM^Jb-{6&ru$!(mZNJ~VEjurs30K@Ksf?X+{LkZu
z>Pk)oKZF<N!s;5)+W2)#{l<AbanxV(tJ}+d9x$$rk7;_S3~HRQQoY2LyWE1Fd^Fva
z>o}LQxb*%5-g|aw>6vzo<WA-FifcW$>e@~e|2+NZ4-<ASD*tfmSI+qrMXKGFteQeY
zN>WcWzkK&ZhxWZ0Rn60P%MxCAC*@rTNjBTp$jrqR8jr(W*<D@ylj?-7e}nEuxt5*%
zYsb0OkLPkJS@ySex%MHpGgDM|q1Ank&AE2ZYrpOzb9WtXtf<QW$zfJi;mj%Kgz|6a
z9}IiHsqq-~>?OVCpQlIb)W5xxbywfOKN{ETyRpdW&YebaZT^qXZ1-fVH$9#b{<{Lb
z?tR(D-><W;{Gf-WGiBnbdDpT&>nSkYZsTUJjw#KYi_s<KW50gio*6S2u60{ucG}R}
zir)J&s$G+<|HJmF%S`ZruxBEYSO{`>C_FY>^PJS6KsJ$zV3q%;Erq2~p&vNs)Gg2`
znWmeLYoBBnrFS^*S@L4q3!Ag`$+Af|lJT&k>hmY5Q_TLv^AB)YHM~un*Xj14JEMKh
zrsu`oz5e4T_35KMjx2TWbvtcSY?D@htQ)UYZQ0uB!Z<zMviM%ZzLi^ws@}TSAaAvE
zsehCcOB7Ni+sZ25a_^YsZw@-GS~Sgl*B8wnm$@Fe)C|RBoVj14tG{%$aHFrLs=DR$
zjUAKb<zGnp#lH5eN?rdpGv2Xy@{uyxOV6q_Po3umNoLcWp7~dx{LPsit<S|Dl`jw0
zzI)R4z543z&dU7a_HCT9>xv3%zg8Hu&$)QAU%g#xrEI}=%k9GOPxv(j_QE$bGAu^%
JT}blQ{{WPuzh?jd

literal 0
HcmV?d00001

diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java
index c014869a1..39662bba9 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/DiagramModelObjectLineStyleCommand.java
+++ b/com.archimatetool.editor/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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
index 96dc34cf4..ccf293c4e 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/AbstractFigureDelegate.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
index 9c91125ea..84b9a908a 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/EllipseFigureDelegate.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
index 8217407cc..186a0fa11 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RectangleFigureDelegate.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
index 368276d99..88cc755de 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/RoundedRectangleFigureDelegate.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
index ea18e069e..8b1c1dfd2 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/DiagramImageFigure.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
index 88d134fdc..8e5b93147 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/GroupFigure.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
index 72a236816..cb5078983 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/diagram/NoteFigure.java
+++ b/com.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
index 0d7f4071b..0d6728f1f 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/AbstractMotivationFigure.java
+++ b/com.archimatetool.editor/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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
index ebd4c7787..b3fce0176 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/figures/elements/GroupingFigure.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
index 66caf75d9..6571622a5 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/sketch/figures/StickyFigure.java
+++ b/com.archimatetool.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/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineStyleComposite.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineStyleComposite.java
index d667883b9..d8acd2e70 100644
--- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/LineStyleComposite.java
+++ b/com.archimatetool.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
index 7664a71ce..b45e3ad65 100644
--- 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
index 12a73676d..e933a254b 100644
--- 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
index 0662f3156..bf7c2cd06 100644
--- 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
index bd02ec19f..df4c2114d 100644
--- 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
index fa8663aad..92eab6b45 100644
--- 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
index 63cad83d4..3f01b7552 100644
--- 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
index 9c7415fe7..66d208be8 100644
--- 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
index 8b223d4b0..fc4ba8ff8 100644
--- 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
index fe183e280..d8f0e282d 100644
--- 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
index 7fe8b5dc4..f25c88746 100644
--- 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;
     
     /**