Revize 407673fa

api.GraphExport rename

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

@@ +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;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Class represents graph with all information about graph plus information about state in which used store graph.
+ * Class is used for creating of JSON which is send to frontend.
+ */
+public class Graph {
+
+    private Set<Vertex> vertices;
+    private List<Edge> edges;
+    private List<VertexArchetype> vertexArchetypes;
+    private List<EdgeArchetype> edgeArchetypes;
+    private List<AttributeType> attributeTypes;
+    private Map<String, List<String>> possibleEnumValues;
+
+    private List<Group> groups;
+    private List<SideBar> sideBar;
+    private int selectedVertex;
+    private int selectedEdge;
+
+    private Logger logger = Logger.getLogger(Graph.class);
+
+    public Graph(cz.zcu.kiv.offscreen.graph.Graph graph) {
+        logger.trace("ENTRY");
+        this.vertices = graph.getVertices();
+        this.edges = graph.getEdges();
+        this.vertexArchetypes = graph.getVertexArchetypes();
+        this.edgeArchetypes = graph.getEdgeArchetypes();
+        this.attributeTypes = graph.getAttributeTypes();
+        this.possibleEnumValues = graph.getPossibleEnumValues();
+        this.groups = graph.getGraphState().getGroups();
+        this.sideBar = graph.getGraphState().getSideBar();
+        this.selectedVertex = graph.getGraphState().getSelectedVertex();
+        this.selectedEdge = graph.getGraphState().getSelectedEdge();
+        logger.trace("EXIT");
+    }
+
+    public List<Edge> getEdges() {
+        logger.trace("ENTRY");
+        logger.trace("EXIT");
+        return edges;
+    }
+
+    public Set<Vertex> getVertices() {
+        logger.trace("ENTRY");
+        logger.trace("EXIT");
+        return vertices;
+    }
+
+    public List<VertexArchetype> getVertexArchetypes() {
+        return vertexArchetypes;
+    }
+
+    public List<EdgeArchetype> getEdgeArchetypes() {
+        return edgeArchetypes;
+    }
+
+    public List<AttributeType> getAttributeTypes() {
+        return attributeTypes;
+    }
+
+    public Map<String, List<String>> getPossibleEnumValues() {
+        return possibleEnumValues;
+    }
+
+    public List<Group> getGroups() {
+        return groups;
+    }
+
+    public List<SideBar> getSideBar() {
+        return sideBar;
+    }
+
+    public int getSelectedVertex() {
+        return selectedVertex;
+    }
+
+    public int getSelectedEdge() {
+        return selectedEdge;
+    }
+}

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

@@ -1 @@
-package cz.zcu.kiv.offscreen.api;
-
-import cz.zcu.kiv.offscreen.graph.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-
-/**
- * Class represents graph with all information about graph plus information about state in which used store graph.
- * Class is used for creating of JSON which is send to frontend.
- */
-public class GraphExport {
-
-    private Set<Vertex> vertices;
-    private List<Edge> edges;
-    private List<VertexArchetype> vertexArchetypes;
-    private List<EdgeArchetype> edgeArchetypes;
-    private List<AttributeType> attributeTypes;
-    private Map<String, List<String>> possibleEnumValues;
-
-    private List<Group> groups;
-    private List<SideBar> sideBar;
-    private int selectedVertex;
-    private int selectedEdge;
-
-    private Logger logger = Logger.getLogger(GraphExport.class);
-
-    public GraphExport(Graph graph) {
-        logger.trace("ENTRY");
-        this.vertices = graph.getVertices();
-        this.edges = graph.getEdges();
-        this.vertexArchetypes = graph.getVertexArchetypes();
-        this.edgeArchetypes = graph.getEdgeArchetypes();
-        this.attributeTypes = graph.getAttributeTypes();
-        this.possibleEnumValues = graph.getPossibleEnumValues();
-        this.groups = graph.getGraphState().getGroups();
-        this.sideBar = graph.getGraphState().getSideBar();
-        this.selectedVertex = graph.getGraphState().getSelectedVertex();
-        this.selectedEdge = graph.getGraphState().getSelectedEdge();
-        logger.trace("EXIT");
-    }
-
-    public List<Edge> getEdges() {
-        logger.trace("ENTRY");
-        logger.trace("EXIT");
-        return edges;
-    }
-
-    public Set<Vertex> getVertices() {
-        logger.trace("ENTRY");
-        logger.trace("EXIT");
-        return vertices;
-    }
-
-    public List<VertexArchetype> getVertexArchetypes() {
-        return vertexArchetypes;
-    }
-
-    public List<EdgeArchetype> getEdgeArchetypes() {
-        return edgeArchetypes;
-    }
-
-    public List<AttributeType> getAttributeTypes() {
-        return attributeTypes;
-    }
-
-    public Map<String, List<String>> getPossibleEnumValues() {
-        return possibleEnumValues;
-    }
-
-    public List<Group> getGroups() {
-        return groups;
-    }
-
-    public List<SideBar> getSideBar() {
-        return sideBar;
-    }
-
-    public int getSelectedVertex() {
-        return selectedVertex;
-    }
-
-    public int getSelectedEdge() {
-        return selectedEdge;
-    }
-}

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/LoadGraphData.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.servlets.api;
 
 import com.google.common.base.Strings;
-import cz.zcu.kiv.offscreen.api.GraphExport;
-import cz.zcu.kiv.offscreen.graph.Graph;
+import cz.zcu.kiv.offscreen.api.Graph;
 import cz.zcu.kiv.offscreen.graph.GraphManager;
 import cz.zcu.kiv.offscreen.graph.loader.DemoDiagramLoader;
 import cz.zcu.kiv.offscreen.graph.loader.GraphJSONDataLoader;
@@ -56 +55 @@
             GraphManager graphManager = new GraphJSONDataLoader(jsonToDisplay).LoadData();
             String configLocation = ConfigurationLoader.getConfigLocation(request.getServletContext());
             JSONConfigLoader configLoader = new JSONConfigLoader(graphManager, configLocation);
-            Graph graph = graphManager.createGraph(configLoader);
-            GraphExport export = new GraphExport(graph);
+            cz.zcu.kiv.offscreen.graph.Graph graph = graphManager.createGraph(configLoader);
+            Graph export = new Graph(graph);
             JSONObject json = JSONObject.fromObject(export);
 
             response.setStatus(HttpServletResponse.SC_OK);