Ensures that style properties are included when finding a style for an element/relationship.

Author: simonbrowndotje

structurizr-core/src/com/structurizr/view/ElementStyle.java

@@ -414,6 +414,10 @@ void copyFrom(ElementStyle elementStyle) {
         if (elementStyle.getDescription() != null) {
             this.setDescription(elementStyle.getDescription());
         }
+
+        for (String name : elementStyle.getProperties().keySet()) {
+            this.addProperty(name, elementStyle.getProperties().get(name));
+        }
     }
 
 }

structurizr-core/src/com/structurizr/view/RelationshipStyle.java

@@ -240,6 +240,10 @@ void copyFrom(RelationshipStyle relationshipStyle) {
         if (relationshipStyle.getOpacity() != null) {
             this.setOpacity(relationshipStyle.getOpacity());
         }
+
+        for (String name : relationshipStyle.getProperties().keySet()) {
+            this.addProperty(name, relationshipStyle.getProperties().get(name));
+        }
     }
 
 }

structurizr-core/test/unit/com/structurizr/view/StylesTests.java

@@ -80,7 +80,7 @@ void findElementStyle_ReturnsTheCorrectStyleForAnElementInstance_WhenStylesAreDe
         SoftwareSystemInstance softwareSystemInstance = deploymentNode.add(softwareSystem);
 
         styles.addElementStyle(Tags.SOFTWARE_SYSTEM).background("#ff0000").color("#ffffff");
-        styles.addElementStyle("Some Tag").color("#0000ff").stroke("#00ff00").shape(Shape.RoundedBox).width(123).height(456);
+        styles.addElementStyle("Some Tag").color("#0000ff").stroke("#00ff00").shape(Shape.RoundedBox).width(123).height(456).addProperty("name", "value");
 
         ElementStyle style = styles.findElementStyle(softwareSystemInstance);
         assertEquals(Integer.valueOf(123), style.getWidth());
@@ -96,6 +96,7 @@ void findElementStyle_ReturnsTheCorrectStyleForAnElementInstance_WhenStylesAreDe
         assertEquals(Integer.valueOf(100), style.getOpacity());
         assertEquals(true, style.getMetadata());
         assertEquals(true, style.getDescription());
+        assertEquals("value", style.getProperties().get("name"));
     }
 
     @Test
@@ -161,7 +162,7 @@ void findRelationshipStyle_ReturnsTheCorrectStyle_WhenStylesAreDefined() {
         relationship.addTags("Some Tag");
 
         styles.addRelationshipStyle(Tags.RELATIONSHIP).color("#ff0000");
-        styles.addRelationshipStyle("Some Tag").color("#0000ff");
+        styles.addRelationshipStyle("Some Tag").color("#0000ff").addProperty("name", "value");
 
         RelationshipStyle style = styles.findRelationshipStyle(relationship);
         assertEquals(Integer.valueOf(2), style.getThickness());
@@ -172,6 +173,7 @@ void findRelationshipStyle_ReturnsTheCorrectStyle_WhenStylesAreDefined() {
         assertEquals(Integer.valueOf(200), style.getWidth());
         assertEquals(Integer.valueOf(50), style.getPosition());
         assertEquals(Integer.valueOf(100), style.getOpacity());
+        assertEquals("value", style.getProperties().get("name"));
     }
 
     @Test