Changeset 869

Timestamp:

02/09/14 22:26:52 (10 years ago)

Author:

ngw8

Message:

Bug fixes and minor changes to dotgraphwriter. Now works on frames that aren't the #1 frame.

File:

• trunk/src/org/expeditee/io/DotGraphWriter.java (modified) (2 diffs)

trunk/src/org/expeditee/io/DotGraphWriter.java

@@ -19 +19 @@
 
         private String framesetName;
-
-        private boolean initialized;
+        
+        private Frame currentFrame;
 
         @Override
         protected void initialise(Frame start, Writer writer) throws IOException {
 
-                if (!this.initialized) {
-                        _format = ".dot";
 
-                        framesetName = start.getFramesetName();
-                        start = FrameUtils.getFrame(framesetName + "1");
+                _format = ".dot";
 
-                        super.initialise(start, writer);
+                framesetName = start.getFramesetName();
 
-                        _writer.write("digraph " + start.getFramesetName() + "{");
-                        _writer.newLine();
-                }
+                currentFrame = FrameUtils.getFrame(framesetName + "0");
+
+                super.initialise(currentFrame, writer);
+
+                _writer.write("digraph " + currentFrame.getFramesetName() + "{");
+                _writer.newLine();
+
         }
         
@@ -42 +43 @@
 
                 initialise(toWrite, null);
-                this.initialized = true;
 
-                while (toWrite != null) {
-                        writeFrame(toWrite, _writer);
+                while (currentFrame != null) {
+                        super.outputFrame(currentFrame);
 
-                        toWrite = FrameIO.LoadNext(toWrite);
+                        currentFrame = FrameIO.LoadNext(currentFrame);
                 }