Revize 9b0966a7

Backend refactor

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

@@ +1 @@
+package cz.zcu.kiv.offscreen.api;
+
+public enum AttributeDataType {
+    NUMBER {
+        @Override
+        public String toString() {
+            return "number";
+        }
+    },
+    DATE {
+        @Override
+        public String toString() {
+            return "date";
+        }
+    },
+    ENUM {
+        @Override
+        public String toString() {
+            return "enum";
+        }
+    },
+    STRING {
+        @Override
+        public String toString() {
+            return "string";
+        }
+    }
+}

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

@@ +1 @@
+package cz.zcu.kiv.offscreen.api;
+
+/**
+ * Class represents one attribute type which is used in input JSON file and in output JSON file (file between frontend
+ * and backend).
+ */
+public class AttributeType {
+    /** name of attribute */
+    public String name;
+    /** data type of attribute */
+    public AttributeDataType dataType;
+    /** additional info */
+    public String text;
+
+    public AttributeType(String name, AttributeDataType dataType, String text) {
+        this.name = name;
+        this.dataType = dataType;
+        this.text = text;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public AttributeDataType getDataType() {
+        return dataType;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

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

@@ +1 @@
+package cz.zcu.kiv.offscreen.api;
+
+public class EdgeArchetype {
+    public String name;
+    public String text;
+
+    EdgeArchetype(String name, String text) {
+        this.name = name;
+        this.text = text;
+    }
+
+    public String getName() {
+        return  name;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.api;
 
-import cz.zcu.kiv.offscreen.graph.*;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

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

@@ +1 @@
+package cz.zcu.kiv.offscreen.api;
+
+public class VertexArchetype {
+    public String name;
+    public String text;
+    public String icon;
+
+    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() {
+        return name;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+}

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

@@ -1 @@
-package cz.zcu.kiv.offscreen.graph;
-
-/**
- * Class represents one attribute type which is used in input JSON file and in output JSON file (file between frontend
- * and backend).
- */
-public class AttributeType {
-    /** name of attribute */
-    public String name;
-    /** data type of attribute */
-    public GraphManager.AttributeDataType dataType;
-    /** additional info */
-    public String text;
-
-    public AttributeType(String name, GraphManager.AttributeDataType dataType, String text) {
-        this.name = name;
-        this.dataType = dataType;
-        this.text = text;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public GraphManager.AttributeDataType getDataType() {
-        return dataType;
-    }
-
-    public String getText() {
-        return text;
-    }
-}

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

@@ -1 @@
-package cz.zcu.kiv.offscreen.graph;
-
-public class EdgeArchetype {
-    public String name;
-    public String text;
-
-    EdgeArchetype(String name, String text) {
-        this.name = name;
-        this.text = text;
-    }
-
-    public String getName() {
-        return  name;
-    }
-
-    public String getText() {
-        return text;
-    }
-}

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.graph;
 
-import cz.zcu.kiv.offscreen.api.Edge;
-import cz.zcu.kiv.offscreen.api.Vertex;
+import cz.zcu.kiv.offscreen.api.*;
 import org.apache.log4j.Logger;
 
 import java.util.*;

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.graph;
 
-import cz.zcu.kiv.offscreen.api.Edge;
-import cz.zcu.kiv.offscreen.api.Group;
-import cz.zcu.kiv.offscreen.api.SubedgeInfo;
-import cz.zcu.kiv.offscreen.api.Vertex;
+import cz.zcu.kiv.offscreen.api.*;
 import cz.zcu.kiv.offscreen.graph.filter.*;
 import cz.zcu.kiv.offscreen.graph.loader.JSONConfigLoader;
 
@@ -11 +8 @@
 
 public class GraphManager {
 
-    public enum AttributeDataType {
-        NUMBER {
-            @Override
-            public String toString() {
-                return "number";
-            }
-        },
-        DATE {
-            @Override
-            public String toString() {
-                return "date";
-            }
-        },
-        ENUM {
-            @Override
-            public String toString() {
-                return "enum";
-            }
-        },
-        STRING {
-            @Override
-            public String toString() {
-                return "string";
-            }
-        }
-    }
-
     public List<VertexArchetype> vertexArchetypes = new ArrayList<>();
     public List<EdgeArchetype> edgeArchetypes = new ArrayList<>();
     public List<AttributeType> attributeTypes = new ArrayList<>();

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

@@ -1 @@
-package cz.zcu.kiv.offscreen.graph;
-
-public class VertexArchetype {
-    public String name;
-    public String text;
-    public String icon;
-
-    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() {
-        return name;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-}

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

@@ -2 +2 @@
 
 import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.graph.Attribute;
+import cz.zcu.kiv.offscreen.api.AttributeDataType;
 import cz.zcu.kiv.offscreen.graph.EdgeArchetypeInfo;
 import cz.zcu.kiv.offscreen.graph.GraphManager;
 import net.sf.json.JSONArray;
@@ -91 +92 @@
         for (int i = 0; i < attributeTypes.size(); i++) {
             JSONObject attributeType = attributeTypes.getJSONObject(i);
             String dataTypeString = attributeType.getString("dataType");
-            GraphManager.AttributeDataType dataType;
+            AttributeDataType dataType;
             switch (dataTypeString) {
-                case "number": dataType = GraphManager.AttributeDataType.NUMBER; break;
-                case "date": dataType = GraphManager.AttributeDataType.DATE; break;
-                case "enum": dataType = GraphManager.AttributeDataType.ENUM; break;
-                default: dataType = GraphManager.AttributeDataType.STRING; break;
+                case "number": dataType = AttributeDataType.NUMBER; break;
+                case "date": dataType = AttributeDataType.DATE; break;
+                case "enum": dataType = AttributeDataType.ENUM; break;
+                default: dataType = AttributeDataType.STRING; break;
             }
             graphManager.addAttributeType(attributeType.getString("name"), dataType, attributeType.getString("text"));
         }

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.graph.loader;
 
-import cz.zcu.kiv.offscreen.graph.AttributeType;
+import cz.zcu.kiv.offscreen.api.AttributeDataType;
+import cz.zcu.kiv.offscreen.api.AttributeType;
 import cz.zcu.kiv.offscreen.graph.EdgeArchetypeInfo;
 import cz.zcu.kiv.offscreen.graph.GraphManager;
 import cz.zcu.kiv.offscreen.graph.filter.*;
@@ -222 +223 @@
         for (Object[] vertexAttributeFilterString : vertexAttributeFilterStrings) {
             int archetypeIndex = graphManager.getVertexArchetypeIndex(vertexAttributeFilterString[0].toString());
             int attributeIndex = graphManager.getAttributeIndex(vertexAttributeFilterString[1].toString());
-            GraphManager.AttributeDataType type = graphManager.attributeTypes.get(attributeIndex).dataType;
+            AttributeDataType type = graphManager.attributeTypes.get(attributeIndex).dataType;
             switch (type) {
                 case NUMBER:
                     NumberAttributeFilter nf = (NumberAttributeFilter) vertexAttributeFilterString[2];
@@ -253 +254 @@
         for (Object[] edgeAttributeFilterString : edgeAttributeFilterStrings) {
             int archetypeIndex = graphManager.getEdgeArchetypeIndex(edgeAttributeFilterString[0].toString());
             int attributeIndex = graphManager.getAttributeIndex(edgeAttributeFilterString[1].toString());
-            GraphManager.AttributeDataType type = graphManager.attributeTypes.get(attributeIndex).dataType;
+            AttributeDataType type = graphManager.attributeTypes.get(attributeIndex).dataType;
             switch (type) {
                 case NUMBER:
                     NumberAttributeFilter nf = (NumberAttributeFilter) edgeAttributeFilterString[2];