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

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -15 +15 @@
 
         private int _indent = 0;
-        
+
         // the list of frames currently being processed
         private Stack<FrameCounter> _frames = new Stack<FrameCounter>();
@@ -81 +81 @@
 
                         Frame next = FrameIO.LoadFrame(cur.frame);
+
                         if (next == null) {
                                 return;
                         }
+
+                        Text title = next.getTitleItem();
 
                         // the items on the frame currently being processed.
@@ -109 +112 @@
                                 // ignore annotation and framenames
                                 if (item.getID() >= 0) {
-                                        //Only follow the links of text items
-                                        if (item instanceof Text && item.getLink() != null
-                                                        && !item.isAnnotation()) {
+                                        // Only follow the links of non annotation text items
+                                        boolean followLink = item instanceof Text
+                                                        && item.getLink() != null
+                                                        && (!item.isAnnotation() /*|| item.getText()
+                                                                        .toLowerCase().equals("@next")*/);
+
+                                        if (followLink) {
                                                 cur.index = i;
                                                 _frames.push(cur);
@@ -139 +146 @@
                                                 // Dont write out the title here because it is written
                                                 // out earlier
-                                        } else if (item != next.getTitleItem())
+                                        } else if (item != title)
                                                 this.writeItem(item);
                                 }
@@ -177 +184 @@
                 }
         }
-        
+
         protected int getIndent() {
                 return _indent;