Modifies how view names are generated to make them all consistent.

Author: simonbrowndotje

structurizr-core/src/main/java/com/structurizr/view/ComponentView.java

@@ -148,7 +148,7 @@ public void remove(Component component) {
      */
     @Override
     public String getName() {
-        return getSoftwareSystem().getName() + " - " + getContainer().getName() + " - Components";
+        return "Component View: " + getSoftwareSystem().getName() + " - " + getContainer().getName();
     }
 
     /**

structurizr-core/src/main/java/com/structurizr/view/ContainerView.java

@@ -77,7 +77,7 @@ public void remove(Container container) {
      */
     @Override
     public String getName() {
-        return getSoftwareSystem().getName() + " - Containers";
+        return "Container View: " + getSoftwareSystem().getName();
     }
 
     /**

structurizr-core/src/main/java/com/structurizr/view/CustomView.java

@@ -40,7 +40,7 @@ public final class CustomView extends ModelView implements AnimatedView {
      */
     @Override
     public String getName() {
-        return "Custom - " + getTitle();
+        return "Custom View: " + getTitle();
     }
 
     /**

structurizr-core/src/main/java/com/structurizr/view/DeploymentView.java

@@ -248,13 +248,9 @@ public RelationshipView add(@Nonnull Relationship relationship) {
     public String getName() {
         String name;
         if (getSoftwareSystem() != null) {
-            name = getSoftwareSystem().getName() + " - Deployment";
+            name = "Deployment View: " + getSoftwareSystem().getName() + " - " + getEnvironment();
         } else {
-            name = "Deployment";
-        }
-
-        if (!StringUtils.isNullOrEmpty(getEnvironment())) {
-            name = name + " - " + getEnvironment();
+            name = "Deployment View: " + getEnvironment();
         }
 
         return name;

structurizr-core/src/main/java/com/structurizr/view/DynamicView.java

@@ -254,9 +254,14 @@ private RelationshipView addRelationship(Relationship relationship, String descr
     @Override
     public String getName() {
         if (element != null) {
-            return element.getName() + " - Dynamic";
+            if (element instanceof Container) {
+                Container container = (Container)element;
+                return "Dynamic View: " + container.getParent().getName() + " - " + container.getName();
+            } else {
+                return "Dynamic View: " + element.getName();
+            }
         } else {
-            return "Dynamic";
+            return "Dynamic View";
         }
     }
 

structurizr-core/src/main/java/com/structurizr/view/SystemContextView.java

@@ -31,7 +31,7 @@ public final class SystemContextView extends StaticView {
      */
     @Override
     public String getName() {
-        return getSoftwareSystem().getName() + " - System Context";
+        return "System Context View: " + getSoftwareSystem().getName();
     }
 
     /**

structurizr-core/src/main/java/com/structurizr/view/SystemLandscapeView.java

@@ -31,7 +31,7 @@ public final class SystemLandscapeView extends StaticView {
      */
     @Override
     public String getName() {
-        return "System Landscape";
+        return "System Landscape View";
     }
 
     /**

structurizr-core/src/main/java/com/structurizr/view/View.java

@@ -111,7 +111,6 @@ public void setTitle(String title) {
      *
      * @return the name, as a String
      */
-    @JsonIgnore
     public abstract String getName();
 
     void setViewSet(@Nonnull ViewSet viewSet) {

structurizr-core/src/test/java/com/structurizr/view/ComponentViewTests.java

@@ -25,7 +25,7 @@ public void setUp() {
 
     @Test
     void construction() {
-        assertEquals("The System - Web Application - Components", view.getName());
+        assertEquals("Component View: The System - Web Application", view.getName());
         assertEquals("Some description", view.getDescription());
         assertEquals(0, view.getElements().size());
         assertSame(softwareSystem, view.getSoftwareSystem());

structurizr-core/src/test/java/com/structurizr/view/ContainerViewTests.java

@@ -20,7 +20,7 @@ public void setUp() {
 
     @Test
     void construction() {
-        assertEquals("The System - Containers", view.getName());
+        assertEquals("Container View: The System", view.getName());
         assertEquals("Description", view.getDescription());
         assertEquals(0, view.getElements().size());
         assertSame(softwareSystem, view.getSoftwareSystem());