Changeset 80 for trunk/src/org/expeditee/io/DefaultTreeWriter.java

Timestamp:

05/30/08 10:14:43 (16 years ago)

Author:

ra33

Message:

Added some more unit tests
Did a bunch of refactoring
AND added a few new features... @b @v were the most significant

File:

• trunk/src/org/expeditee/io/DefaultTreeWriter.java (modified) (9 diffs)

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

@@ -9 +9 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 public abstract class DefaultTreeWriter extends DefaultFrameWriter implements
@@ -15 +16 @@
         // the list of frames currently being processed
         private Stack<FrameCounter> _frames = new Stack<FrameCounter>();
+
         private int _frameCount = 0;
-        
+
         public int getFrameCount() {
                 return _frameCount;
@@ -24 +26 @@
                 try {
                         initialise(toWrite);
-
                         outputTree(toWrite);
 
-                        _running = false;
-                        return finaliseTree();
                 } catch (IOException ioe) {
                         _running = false;
                         throw ioe;
+                } catch (Exception e) {
+                        e.printStackTrace();
                 }
+                _running = false;
+                return finaliseTree();
         }
 
@@ -66 +69 @@
                         return;
 
-                _frames.push(new FrameCounter(toWrite.getFrameName(), -1));
+                _frames.push(new FrameCounter(toWrite.getName(), -1));
 
                 // process the entire tree of frames in depth-first order
                 while (_frames.size() > 0) {
                         FrameCounter cur = _frames.pop();
+
+                        if (_stop)
+                                return;
 
                         Frame next = FrameIO.LoadFrame(cur.frame);
@@ -85 +91 @@
                                 this.resumeFrame(next);
                         } else {
-                                FrameGraphics.OverwriteMessage("Writing: "
-                                                + next.getFrameName());
-                                _frameCount ++;
+                                FrameGraphics.OverwriteMessage("Writing: " + next.getName());
+                                _frameCount++;
                                 writeStartFrame(next);
                         }
@@ -102 +107 @@
                                 // ignore annotation and framenames
                                 if (item.getID() >= 0) {
-                                        if (item.getLink() != null && !item.isAnnotation()) {
+                                        //Only follow the links of text items
+                                        if (item instanceof Text && item.getLink() != null
+                                                        && !item.isAnnotation()) {
                                                 cur.index = i;
                                                 _frames.push(cur);
@@ -110 +117 @@
                                                 this.writeStartLink(item);
 
-                                                Frame linked = FrameIO.LoadFrame(item.getAbsoluteLink());
+                                                Frame linked = FrameIO
+                                                                .LoadFrame(item.getAbsoluteLink());
 
                                                 // if the linked frame was found, then display it next
                                                 if (linked != null) {
-                                                        FrameCounter fc = new FrameCounter(linked
-                                                                        .getFrameName(), -1);
+                                                        FrameCounter fc = new FrameCounter(
+                                                                        linked.getName(), -1);
                                                         if (!_frames.contains(fc)) {
                                                                 // remember what frame we are on before
@@ -127 +135 @@
                                                         }
                                                 }
-                                        } else if (item != next.getTitle())
+                                                // Dont write out the title here because it is written
+                                                // out earlier
+                                        } else if (item != next.getTitleItem())
                                                 this.writeItem(item);
                                 }
@@ -160 +170 @@
                         if (o instanceof FrameCounter)
                                 return (((FrameCounter) o).frame.equals(frame));// && fc.index
-                                                                                                                                // == index);
+                        // == index);
 
                         return false;