- first try to undo/redo using new serialization of graph [#14]

- remove all graphml codes
rostam · Dec 19, 2015 · 35abdca · 35abdca
1 parent a71966a
commit 35abdca
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 439 deletions.
diff --git a/src/graphtea/extensions/io/GraphSaveObject.java b/src/graphtea/extensions/io/GraphSaveObject.java
@@ -41,7 +41,7 @@ public GraphModel getG() {
         return g;
     }
 
-    public static byte[] getBytesOfGraph(GraphModel g) {
+    public static ByteArrayOutputStream getBytesOfGraph(GraphModel g) {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         try {
             ObjectOutputStream oop = new ObjectOutputStream(bout);
@@ -51,7 +51,14 @@ public static byte[] getBytesOfGraph(GraphModel g) {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return null;
+        return bout;
+    }
+    public static String graph2String(GraphModel g){
+        return getBytesOfGraph(g).toString();
+    }
+
+    public static GraphModel String2Graph(String s){
+        return getGraphFromBytes(s.getBytes());
     }
 
     public static GraphModel getGraphFromBytes(byte[] b) {

diff --git a/src/graphtea/graph/graph/AbstractGraphRenderer.java b/src/graphtea/graph/graph/AbstractGraphRenderer.java
@@ -36,6 +36,7 @@ protected AbstractGraphRenderer() {
 
     public void setGraph(GraphModel g) {
         this.graph = g;
+        System.out.println(g.getLabel() + "<<<");
         g.addGraphListener(this);
         new GraphNotifiableAttrSet(g).addAttributeListener(this);
         this.repaintGraph();

diff --git a/src/graphtea/graph/io/GraphJSON.java b/src/graphtea/graph/io/GraphJSON.java
diff --git a/src/graphtea/graph/io/GraphML.java b/src/graphtea/graph/io/GraphML.java
diff --git a/src/graphtea/plugins/commonplugin/undo/RedoAction.java b/src/graphtea/plugins/commonplugin/undo/RedoAction.java
@@ -7,8 +7,8 @@
 author :roozbeh
 */
 
+import graphtea.extensions.io.GraphSaveObject;
 import graphtea.graph.graph.GraphModel;
-import graphtea.graph.io.GraphML;
 import graphtea.platform.core.AbstractAction;
 import graphtea.platform.core.BlackBoard;
 import graphtea.plugins.commonplugin.Init;
@@ -37,8 +37,8 @@ public void performAction(String eventName, Object value) {
     public static void redo(BlackBoard blackboard) {
         GraphData gd = new GraphData(blackboard);
         UndoManager logManager = Init.undoers.get(gd.getGraph());
-        String gml = logManager.getNextRedoData();
-        GraphModel gm = GraphML.GraphML2Graph(gml);
+        String gs = logManager.getNextRedoData();
+        GraphModel gm = GraphSaveObject.String2Graph(gs);
         gd.getGraphRenderer().setGraph(gm);
     }
 }
diff --git a/src/graphtea/plugins/commonplugin/undo/UndoAction.java b/src/graphtea/plugins/commonplugin/undo/UndoAction.java
@@ -7,8 +7,8 @@
 author :roozbeh
 */
 
+import graphtea.extensions.io.GraphSaveObject;
 import graphtea.graph.graph.GraphModel;
-import graphtea.graph.io.GraphJSON;
 import graphtea.platform.core.AbstractAction;
 import graphtea.platform.core.BlackBoard;
 import graphtea.plugins.commonplugin.Init;
@@ -37,7 +37,7 @@ public static void undo(BlackBoard blackboard) {
         GraphData gd = new GraphData(blackboard);
         UndoManager logManager = Init.undoers.get(gd.getGraph());
         String ud = logManager.getNextUndoData();
-        GraphModel gm = GraphJSON.Json2Graph(ud);
+        GraphModel gm = GraphSaveObject.String2Graph(ud);
 //        gd.getGraph().addSubGraph();
         gd.getGraphRenderer().setGraph(gm);
     }

diff --git a/src/graphtea/plugins/commonplugin/undo/UndoManager.java b/src/graphtea/plugins/commonplugin/undo/UndoManager.java
@@ -8,8 +8,8 @@
 * author: azin azadi
 */
 
+import graphtea.extensions.io.GraphSaveObject;
 import graphtea.graph.graph.GraphModel;
-import graphtea.graph.io.GraphJSON;
 
 public class UndoManager {
     public static final String EVENT_KEY = "Undo Log Manager";
@@ -25,11 +25,13 @@ public UndoManager(GraphModel g) {
     String lastgml = "";
 
     void watchGraph(final GraphModel g) {
+        System.out.println("watch undo manager");
         new Thread() {
             public void run() {
                 while (true) {
                     try {
-                        String cur = GraphJSON.Graph2Json(g);
+
+                        String cur = GraphSaveObject.graph2String(g);
                         if (!cur.equals(lastgml)) {
                             //st changed
                             System.out.println(cur);

diff --git a/src/graphtea/plugins/main/ccp/Copy.java b/src/graphtea/plugins/main/ccp/Copy.java
@@ -4,12 +4,12 @@
 // Distributed under the terms of the GNU General Public License (GPL): http://www.gnu.org/licenses/
 package graphtea.plugins.main.ccp;
 
+import graphtea.extensions.io.GraphSaveObject;
 import graphtea.graph.atributeset.GraphAttrSet;
 import graphtea.graph.graph.Edge;
 import graphtea.graph.graph.GraphModel;
 import graphtea.graph.graph.SubGraph;
 import graphtea.graph.graph.Vertex;
-import graphtea.graph.io.GraphML;
 import graphtea.platform.core.AbstractAction;
 import graphtea.platform.core.BlackBoard;
 import graphtea.plugins.main.select.Select;
@@ -48,7 +48,7 @@ public static void copy(SubGraph subGraph) {
         copyGraph(subGraph, g);
 //        gg.view.repaint();
         Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
-        String data = GraphML.graph2GraphML_with_headers(g);
+        String data = GraphSaveObject.graph2String(g);
 
 
         StringSelection string = new StringSelection(data);