Revize bb5a2d83

Removed archetypeIcons array and added icon to vertexArchetypes

sources/src/main/java/cz/zcu/kiv/offscreen/api/GraphExport.java

@@ -20 +20 @@
     private List<EdgeArchetype> edgeArchetypes;
     private List<AttributeType> attributeTypes;
     private Map<String, List<String>> possibleEnumValues;
-    private Map<String, String> archetypeIcons;
 
     private List<Group> groups;
     private List<Position> positions;
@@ -38 +37 @@
         this.edgeArchetypes = new ArrayList<>(graph.getEdgeArchetypes());
         this.attributeTypes = new ArrayList<>(graph.getAttributeTypes());
         this.possibleEnumValues = graph.getPossibleEnumValues();
-        this.archetypeIcons = graph.getArchetypeIcons();
         this.groups = graph.getGraphState().getGroups();
         this.positions = graph.getGraphState().getPositions();
         this.sideBar = graph.getGraphState().getSideBar();
@@ -75 +73 @@
         return possibleEnumValues;
     }
 
-    public Map<String, String> getArchetypeIcons() {
-        return archetypeIcons;
-    }
-
     public List<Group> getGroups() {
         return groups;
     }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/Graph.java

@@ -21 +21 @@
     private List<AttributeType> attributeTypes;
     private Map<String, List<String>> possibleEnumValues;
     private List<String> defaultGroupArchetypes;
-    private Map<String, String> archetypeIcons;
 
     private GraphState graphState;
 
@@ -67 +66 @@
         }
     }
 
-    public void setArchetypeIcons(Map<String, String> archetypeIcons) {
-        this.archetypeIcons = archetypeIcons;
-    }
-
     public List<String> getDefaultGroupArchetypes() {
         return defaultGroupArchetypes;
     }
@@ -87 +82 @@
         return possibleEnumValues;
     }
 
-    public Map<String, String> getArchetypeIcons() {
-        return archetypeIcons;
-    }
-
     public Map<Integer, Vertex> getVertices() {
         logger.trace("ENTRY");
         logger.trace("EXIT");

sources/src/main/java/cz/zcu/kiv/offscreen/graph/GraphManager.java

@@ -266 +266 @@
         if (filter == null) {
             // To Enable Everything
             filter = new GraphFilter();
-            filter.setVertexArchetypeFilter(new ArrayList<Integer>(), GraphFilter.ArchetypeMatchType.NON_MATCHING);
-            filter.setEdgeArchetypeFilter(new ArrayList<EdgeArchetypeInfo>(), GraphFilter.ArchetypeMatchType.NON_MATCHING);
+            filter.setVertexArchetypeFilter(new ArrayList<>(), GraphFilter.ArchetypeMatchType.NON_MATCHING);
+            filter.setEdgeArchetypeFilter(new ArrayList<>(), GraphFilter.ArchetypeMatchType.NON_MATCHING);
         }
 
-        Map<String, String> archetypeIcons = configLoader.loadArchetypeIcons();
-        graph.setArchetypeIcons(archetypeIcons);
 
         List<String> defaultGroupArchetypes = configLoader.loadGroupArchetypesStrings();
         graph.setDefaultGroupArchetypes(defaultGroupArchetypes);
 
-
-
-
         Set<VertexImpl> resultVertices = getVerticesByArchetypeFilter(filter);
-
         resultVertices = getVerticesByAttributeFilter(filter, resultVertices);
-
         List<EdgeImpl> resultEdges = getEdgesByArchetypeFilter(filter, resultVertices);
-
         resultEdges = getEdgesByAttributeFilter(filter, resultEdges);
 
         addVerticesToGraph(graph, resultVertices);
-
         addEdgesToGraph(graph, resultEdges);
 
+        Map<String, String> archetypeIcons = configLoader.loadArchetypeIcons();
+        addVertexArchetypes(graph, archetypeIcons);
+        graph.setEdgeArchetypes(edgeArchetypes);
+
         graph.setAttributeTypes(attributeTypes);
         graph.setPossibleEnumValues(possibleEnumValues);
 
@@ -493 +488 @@
             Edge edge = new Edge(idCounter++, edgeImpl.getFrom(), edgeImpl.getTo(), edgeImpl.getText(), edgeSet.get(edgeImpl));
             graph.addEdge(edge);
         }
+    }
+
+    /**
+     * Adds icons from input map to vertexArchetypes and add archetypes to graph.
+     *
+     * @param graph - Graph in which will be set vertex archetypes
+     * @param archetypeIcons Map where key is archetype name and value is svg icon.
+     */
+    private void addVertexArchetypes(Graph graph, Map<String, String> archetypeIcons){
+
+        for(VertexArchetype archetype : vertexArchetypes){
+            for(String archetypeName : archetypeIcons.keySet()){
+
+                if(archetype.name.equals(archetypeName)){
+                    archetype.icon = archetypeIcons.get(archetypeName);
+                    break;
+                }
+            }
+        }
         graph.setVertexArchetypes(vertexArchetypes);
-        graph.setEdgeArchetypes(edgeArchetypes);
     }
 
     /**

sources/src/main/java/cz/zcu/kiv/offscreen/graph/VertexArchetype.java

@@ -3 +3 @@
 public class VertexArchetype {
     public String name;
     public String text;
+    public String icon;
 
-    VertexArchetype(String name, String text) {
+    VertexArchetype(String name, String text, String icon) {
         this.name = name;
         this.text = text;
+        this.icon = icon;
+    }
+
+    VertexArchetype(String name, String text) {
+        this(name, text, "");
     }
 
     public String getName() {
@@ -16 +22 @@
     public String getText() {
         return text;
     }
+
+    public String getIcon() {
+        return icon;
+    }
 }