Revize d63e43a4

Used Gson in Spade converter

sources/imiger-module/src/main/java/cz/zcu/kiv/imiger/vo/BaseVertex.java

@@ -11 +11 @@
     /** Name of vertex. */
     private String name;
     /** Index of vertex archetype. */
-    private int archetypeIndex;
+    private int archetype;
     /** Additional info. */
     private String text;
 
     public BaseVertex(int id, String name, int archetypeIndex, String text) {
         this.id = id;
         this.name = name;
-        this.archetypeIndex = archetypeIndex;
+        this.archetype = archetypeIndex;
         this.text = text;
     }
 
@@ -39 +39 @@
     }
 
     public int getArchetype() {
-        return archetypeIndex;
+        return archetype;
     }
 
     public void setArchetype(int archetypeIndex) {
-        this.archetypeIndex = archetypeIndex;
+        this.archetype = archetypeIndex;
     }
 
     public String getText() {

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/Spade.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade;
 
+import com.google.gson.Gson;
 import cz.zcu.kiv.imiger.spi.IModule;
 import cz.zcu.kiv.imiger.vo.Graph;
 import cz.zcu.kiv.imiger.plugin.spade.graph.GraphManager;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.GraphJSONDataLoader;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.JSONConfigLoader;
-import net.sf.json.JSONObject;
 
 public class Spade implements IModule {
     @Override
@@ -25 +25 @@
         JSONConfigLoader configLoader = new JSONConfigLoader(graphManager);
 
         Graph graph = graphManager.createGraph(configLoader);
-        JSONObject json = JSONObject.fromObject(graph);
 
-        return json.toString();
+        return new Gson().toJson(graph);
     }
 }