Changeset 108 for trunk/src/org/expeditee/agents/SwitchyardTree.java

Timestamp:

06/27/08 16:44:21 (16 years ago)

Author:

ra33

Message:

Heaps of changes!!!!
Added circles...
Better drawing of lines etc etc

File:

• trunk/src/org/expeditee/agents/SwitchyardTree.java (modified) (5 diffs)

trunk/src/org/expeditee/agents/SwitchyardTree.java

@@ -2 +2 @@
 
 import java.awt.Color;
-import java.awt.Point;
+import java.awt.geom.Point2D;
 
 import org.expeditee.gui.Frame;
@@ -16 +16 @@
                 for (Text textItem : frame.getBodyTextItems(false)) {
                         // Delete all non-annotations with more that one letter
-                        if (textItem.getText().length() > 1)
+                        if (textItem.getText().length() > 1){
                                 frame.removeItem(textItem);
-                        else {
+                                if(_stop)
+                                        return null;
+                        }else {
                                 // goto child frame of any linked 1 letter items
                                 String link = textItem.getAbsoluteLink();
@@ -24 +26 @@
                                         Frame childFrame = FrameIO.LoadFrame(link);
                                         if (childFrame != null) {
-                                                Point lastItemEnd = textItem.getEndParagraphPosition();
+                                                Point2D.Float lastItemEnd = textItem.getEndParagraphPosition();
                                                 for (Text childItem : childFrame.getBodyTextItems(false)) {
                                                         // look for red items
@@ -31 +33 @@
                                                                 Text itemCopy = childItem.copy();
                                                                 // add to the right of parent item
-                                                                lastItemEnd.translate(20, 0);
-                                                                itemCopy.setPosition(lastItemEnd);
+                                                                lastItemEnd.setLocation(lastItemEnd.x + 20, lastItemEnd.y);
+                                                                itemCopy.setPosition(lastItemEnd.x, lastItemEnd.y);
                                                                 lastItemEnd = itemCopy
                                                                                 .getEndParagraphPosition();
@@ -38 +40 @@
                                                         }
                                                         _itemCount++;
+                                                        if(_stop)
+                                                                return null;
                                                 }
                                         }