Revize 918e91a9

Resolve exceptions when config file is not defined

sources/src/main/java/cz/zcu/kiv/offscreen/graph/filter/GraphFilter.java

@@ -3 +3 @@
 import cz.zcu.kiv.offscreen.graph.EdgeArchetypeInfo;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -88 +89 @@
         REGULAR_EXPRESSION
     }
 
-    private VertexArchetypeFilter vertexArchetypeFilter;
-    private EdgeArchetypeFilter edgeArchetypeFilter;
+    private VertexArchetypeFilter vertexArchetypeFilter = new VertexArchetypeFilter(new ArrayList<>(), ArchetypeMatchType.NON_MATCHING);
+    private EdgeArchetypeFilter edgeArchetypeFilter = new EdgeArchetypeFilter(new ArrayList<>(), ArchetypeMatchType.NON_MATCHING);
 
     /**
      * key is the vertex archetype index, value is the filter object
@@ -118 +119 @@
     }
 
     public void setVertexArchetypeFilter(List<Integer> archetypeIndices, ArchetypeMatchType matchType) {
-        vertexArchetypeFilter = new VertexArchetypeFilter(archetypeIndices, matchType);
+        vertexArchetypeFilter.archetypeIndeces.clear();
+        vertexArchetypeFilter.archetypeIndeces.addAll(archetypeIndices);
+        vertexArchetypeFilter.matchType = matchType;
     }
 
     public void setEdgeArchetypeFilter(List<EdgeArchetypeInfo> archetypeIndices, ArchetypeMatchType matchType) {
-        edgeArchetypeFilter = new EdgeArchetypeFilter(archetypeIndices, matchType);
+        edgeArchetypeFilter.archetypeIndeces.clear();
+        edgeArchetypeFilter.archetypeIndeces.addAll(archetypeIndices);
+        edgeArchetypeFilter.matchType = matchType;
     }
 
     public void setVertexNumberAttributeFilter(int archetypeIndex, int attributeTypeIndex, BigDecimal min, BigDecimal max, boolean minInclusive, boolean maxInclusive, NumberMatchType matchType) {

sources/src/main/java/cz/zcu/kiv/offscreen/graph/loader/JSONConfigLoader.java

@@ -67 +67 @@
 
             createEdgeAttributeFilters(filter, edgeAttributeFilterStrings);
 
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException e) {
             e.printStackTrace();
         }
 
@@ -347 +347 @@
     public Map<String, String> loadArchetypeIcons() {
         Map<String, String> archetypeIcons = new HashMap<>();
 
-        JSONArray archetypeIconsJson = json.getJSONArray("archetypeIcons");
-        for (int i = 0; i < archetypeIconsJson.size(); i++) {
-            JSONObject icon = archetypeIconsJson.getJSONObject(i);
-            String archetypeName = icon.getString("name");
-            String iconSvg = icon.getString("value");
+        if (json != null){
+            JSONArray archetypeIconsJson = json.getJSONArray("archetypeIcons");
+            for (int i = 0; i < archetypeIconsJson.size(); i++) {
+                JSONObject icon = archetypeIconsJson.getJSONObject(i);
+                String archetypeName = icon.getString("name");
+                String iconSvg = icon.getString("value");
 
-            archetypeIcons.put(archetypeName, iconSvg);
+                archetypeIcons.put(archetypeName, iconSvg);
+            }
         }
-
         return archetypeIcons;
     }
 
@@ -366 +367 @@
     public List<Integer> loadGroupArchetypes() {
         List<Integer> defaultGroupArchetypes = new ArrayList<>();
 
-        JSONArray defaultGroupArchetypesJson = json.getJSONArray("defaultGroupArchetypes");
-        for (int i = 0; i < defaultGroupArchetypesJson.size(); i++) {
-            String archetype = defaultGroupArchetypesJson.get(i).toString();
-            defaultGroupArchetypes.add(graphManager.getVertexArchetypeIndex(archetype));
+        if(json != null) {
+            JSONArray defaultGroupArchetypesJson = json.getJSONArray("defaultGroupArchetypes");
+            for (int i = 0; i < defaultGroupArchetypesJson.size(); i++) {
+                String archetype = defaultGroupArchetypesJson.get(i).toString();
+                defaultGroupArchetypes.add(graphManager.getVertexArchetypeIndex(archetype));
+            }
         }
 
         return defaultGroupArchetypes;
@@ -382 +385 @@
     public List<String> loadGroupArchetypesStrings(){
         List<String> groupArchetypes = new ArrayList<>();
 
-        JSONArray defaultGroupArchetypesJson = json.getJSONArray("defaultGroupArchetypes");
-        for (Object jsonItem : defaultGroupArchetypesJson) {
-            groupArchetypes.add(jsonItem.toString());
+        if (json != null) {
+            JSONArray defaultGroupArchetypesJson = json.getJSONArray("defaultGroupArchetypes");
+            for (Object jsonItem : defaultGroupArchetypesJson) {
+                groupArchetypes.add(jsonItem.toString());
+            }
         }
         return groupArchetypes;
     }