Revize 630e6753

Fixed problem with data, implemented method getRawJson

sources/imiger-dot-converter/src/main/java/cz/zcu/kiv/imiger/plugin/dot/BaseGraphFactory.java

@@ -22 +22 @@
 
 
 	protected BaseGraphFactory(BaseDOTLoader<V, E> dotLoader) {
+		vertices = new ArrayList<>();
+		edges = new ArrayList<>();
+		attributeTypes = new ArrayList<>();
 		loadData(dotLoader);
 	}
 

sources/imiger-dot-converter/src/main/java/cz/zcu/kiv/imiger/plugin/dot/DOT.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.dot;
 
+import com.google.gson.Gson;
+import cz.zcu.kiv.imiger.plugin.dot.dto.EdgeDTO;
+import cz.zcu.kiv.imiger.plugin.dot.dto.VertexDTO;
+import cz.zcu.kiv.imiger.plugin.dot.loader.BaseDOTLoader;
+import cz.zcu.kiv.imiger.plugin.dot.loader.PaypalDOTLoader;
 import cz.zcu.kiv.imiger.spi.IModule;
+import cz.zcu.kiv.imiger.vo.Graph;
 
 public class DOT implements IModule {
     @Override
@@ -10 +16 @@
 
     @Override
     public String getRawJson(String stringToConvert) {
-        return null;
+        BaseDOTLoader<VertexDTO, EdgeDTO> loader = new PaypalDOTLoader(stringToConvert);
+        GraphFactory graphFactory = new GraphFactory(loader);
+        Graph graph = graphFactory.createGraph();
+
+        Gson gson = new Gson();
+        return gson.toJson(graph, Graph.class);
     }
 }

sources/imiger-dot-converter/src/main/java/cz/zcu/kiv/imiger/plugin/dot/GraphFactory.java

@@ -21 +21 @@
 
 	public GraphFactory(BaseDOTLoader<VertexDTO,EdgeDTO> dotLoader) {
 		super(dotLoader);
-		vertices = new ArrayList<>();
-		edges = new ArrayList<>();
-		attributeTypes = new ArrayList<>();
 		prepareEdgeArchetypes();
 		prepareVertexArchetypes();
 	}
@@ -38 +35 @@
 			vertices = new ArrayList<>(loadedVertices);
 		}
 
-		if (loadedVertices != null) {
+		if (loadedEdges != null) {
 			edges = new ArrayList<>(loadedEdges);
 		}
 
-		if (loadedVertices != null) {
+		if (loadedAttributeTypes != null) {
 			attributeTypes = new ArrayList<>(loadedAttributeTypes);
 		}
 	}
@@ -64 +61 @@
 		for (VertexDTO v : vertices) {
 
 			List<String[]> attributes = new ArrayList<>();
-			attributes.add((String[]) v.getAttributes().values().toArray());
+			attributes.add(convertListToArray(v.getAttributes().values()));
 			Vertex vertex = new Vertex(v.getId(), v.getName(), DEFAULT_ARCHETYPE_INDEX, "", attributes);
 			graph.getVertices().add(vertex);
 		}
@@ -74 +71 @@
 		for (EdgeDTO e : edges) {
 
 			List<String[]> attributes = new ArrayList<>();
-			attributes.add((String[]) e.getAttributes().values().toArray());
+			attributes.add(convertListToArray(e.getAttributes().values()));
 			SubedgeInfo subedgeInfo = new SubedgeInfo(e.getId(), DEFAULT_ARCHETYPE_INDEX, attributes);
 
 			List<SubedgeInfo> subedgeInfos = new ArrayList<>();
@@ -85 +82 @@
 		}
 	}
 
+	private String[] convertListToArray(Collection<String> list) {
+		String[] array = new String[list.size()];
+		int i = 0;
+
+		for (String str: list) {
+			array[i++] = str;
+		}
+
+		return array;
+	}
+
 	private void prepareEdgeArchetypes() {
 		edgeArchetypes= new ArrayList<>();
 		edgeArchetypes.add(new EdgeArchetype(EDGE_ARCHETYPE_NAME, ARCHETYPE_TEXT));