Changeset 26

Timestamp:

05/14/08 08:56:41 (16 years ago)

Author:

ra33

Message:

change so that overlay items that get picked up get anchored back on the overlay

Location:

trunk/src/org/expeditee

Files:

• agents/DisplayTree.java (modified) (2 diffs)
• gui/Frame.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (5 diffs)
• gui/FrameUtils.java (modified) (9 diffs)
• items/ItemUtils.java (modified) (1 diff)

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

@@ -23 +23 @@
 
         // delay between frames, in ms
-        private long _delay = 50;
+        private long _delay = 0;
 
         // The shortest delay between frames
@@ -71 +71 @@
                         System.out.println(_runtime.freeMemory());
                 
-                FrameUtils.ResponseTimer.restart();
+                //FrameUtils.ResponseTimer.restart();
                 
                 // ignore loops
                 if (toProcess != DisplayIO.getCurrentFrame())
-                        FrameUtils.DisplayFrame(toProcess, false);
-
+                        DisplayIO.setCurrentFrame(toProcess);
+                        //FrameUtils.DisplayFrame(toProcess,false);
                 // parse the frame for any pause settings
                 delay(toProcess);

trunk/src/org/expeditee/gui/Frame.java

@@ -221 +221 @@
         public List<Text> getBodyTextItems(boolean includeAnnotations) {
                 List<Text> bodyTextItems = new ArrayList<Text>();
-                Text frameTitle = getTitle();
 
                 for (Item i : getItems()) {
                         // only add up normal body text items
-                        if ((i instanceof Text) && i != frameTitle && 
+                        if ((i instanceof Text) && 
                                         (includeAnnotations || !i.isAnnotation())) {
                                 bodyTextItems.add((Text) i);
                         }
                 }
+                bodyTextItems.remove(getTitle());
 
                 return bodyTextItems;           

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -1357 +1357 @@
                         checkTDFCItemWaiting();
                         FrameUtils.DisplayFrame(toLoad);
-                }else {
+                } else {
                         FrameGraphics.ErrorMessage(toLoad + " is not a valid frame name.");
                 }
@@ -1853 +1853 @@
          */
         public static void pickup(Item toGrab) {
-
                 // Brook: If the widget corner is being picked up. Instead refer to
                 // picking
@@ -1868 +1867 @@
 
         public static void pickup(List<Item> toGrab) {
+                String currentFrame = DisplayIO.getCurrentFrame().getFrameName();
                 for (Item i : toGrab) {
                         // Check if it has a relative link if so make it absolute
@@ -1873 +1873 @@
 
                         // parent may be null
-                        if (i.getParent() != null)
+                        if (i.getParent() != null) {
                                 i.getParent().removeItem(i);
-
+                                if (currentFrame.equals(i.getParent().getFrameName()))
+                                        i.setParent(null);
+                        }
                         Frame.FreeItems.add(i);
-                        i.setParent(null);
+                        
                         if (i instanceof Dot)
                                 ((Dot) i).setFloating(true);
@@ -1951 +1953 @@
                 // toAnchor.getY());
 
-                Frame current = DisplayIO.getCurrentFrame();
-                // toAnchor.anchor(current);
-
+                Frame current = null;
+
+                // if the item is from an overlay the parent will NOT be null
+                if (toAnchor.getParent() == null) {
+                        current = DisplayIO.getCurrentFrame();
+                } else {
+                        current = toAnchor.getParent();
+                }
                 // update the items ID to prevent conflicts with the current frame
                 if (toAnchor.getID() < 0 || current.getItems().contains(toAnchor))
                         ;
                 toAnchor.setID(current.getNextItemID());
-
+                toAnchor.setOffset(0, 0);
                 toAnchor.setParent(current);
-                toAnchor.setOffset(0, 0);
+
                 current.addItem(toAnchor);
                 current.setResort(true);

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -526 +526 @@
                                 else {
                                         FrameGraphics.WarningMessage("Home frame: " + first
-                                                        + " could not be found.");
+                                                        + " is not a valid frame.");
                                         UserSettings.FirstFrame = profile.getFrameName();
                                 }
@@ -565 +565 @@
                                 UserSettings.CodeCommentTemplate = ((Text) item)
                                                 .getTemplateForm();
-                        } else if (ItemUtils.isTag(item, "@FrameDir:")) {
+                        } else if (ItemUtils.isTag(item, "@FramesetDir:")) {
                                 String dir = getDir(item, null);
                                 if (dir != null)
-                                        UserSettings.FrameDirs.add(0, dir);
+                                        UserSettings.FrameDirs.add(dir);
                         } else if (ItemUtils.isTag(item, "@LogDir:")) {
                                 org.expeditee.gui.FrameIO.LOGS_DIR = getDir(item,
                                                 org.expeditee.gui.FrameIO.LOGS_DIR);
                         } else if (ItemUtils.isTag(item, "@ImageDir:")) {
-                                String dir = getDir(item, null);
-                                if (dir != null)
-                                        UserSettings.ImageDirs.add(0, dir);
+                                ArrayList<String> dirs = getDirs(item);
+                                if (dirs != null)
+                                        UserSettings.ImageDirs.addAll(dirs);
                         } else if (ItemUtils.isTag(item, "@Threading:")) {
                                 UserSettings.Threading = getBoolean(item,
@@ -583 +583 @@
                         } else if (ItemUtils.isTag(item, "@BackgroundColorWheel")) {
                                 Item.FILL_COLOR_WHEEL = getColorWheel(item);
+                        } else if (ItemUtils.isTag(item, "@FramesetDirs")) {
+                                UserSettings.FrameDirs.addAll(getDirs(item));
                         }
                 }
@@ -588 +590 @@
                 if (UserSettings.FirstFrame == null)
                         UserSettings.FirstFrame = profile.getFrameName();
+                else {
+                        if (FrameIO.LoadFrame(UserSettings.FirstFrame) == null) {
+                                FrameGraphics.WarningMessage("Home frame: "
+                                                + UserSettings.FirstFrame + " could not be found.");
+                                UserSettings.FirstFrame = profile.getFrameName();
+                        }
+                }
 
         }
@@ -604 +613 @@
                         }
                 }
-                return new Color[]{Color.black, Color.white};
+                return new Color[] { Color.black, Color.white };
         }
 
@@ -612 +621 @@
 
                 String value = AttributeUtils.stripValue(((Text) item).getFirstLine())
-                                .trim().toLowerCase();
+                                .trim();
                 if (value.length() > 0) {
                         item.setLink(value);
@@ -669 +678 @@
 
                 return alt;
+        }
+
+        private static ArrayList<String> getDirs(Item item) {
+                ArrayList<String> dirsToAdd = new ArrayList<String>();
+                String dirListFrameName = item.getAbsoluteLink();
+
+                if (dirListFrameName != null) {
+                        Frame dirListFrame = FrameIO.LoadFrame(dirListFrameName);
+                        for (Text t : dirListFrame.getBodyTextItems(false)) {
+                                String dirName = t.getTextNoList().trim();
+                                File tester = new File(dirName);
+                                if (tester.exists() && tester.isDirectory()) {
+                                        if (dirName.endsWith(File.separator))
+                                                dirsToAdd.add(dirName);
+                                        else
+                                                dirsToAdd.add(dirName + File.separator);
+                                }
+                        }
+                }
+
+                return dirsToAdd;
         }
 
@@ -683 +713 @@
 
                 String value = AttributeUtils.stripValue(((Text) item).getFirstLine())
-                                .trim().toLowerCase();
+                                .trim();
                 if (value != null && value.length() > 0)
                         return value;
@@ -1239 +1269 @@
                                 for (File helpFrameset : helpFramesets) {
                                         String framesetName = helpFrameset.getName();
-                                        Frame indexFrame = FrameIO.LoadFrame(framesetName+ '1');
+                                        Frame indexFrame = FrameIO.LoadFrame(framesetName + '1');
                                         // Look through the folder for help index pages
                                         if (indexFrame != null

trunk/src/org/expeditee/items/ItemUtils.java

@@ -162 +162 @@
                 Text txt = (Text) toCheck;
                 // tags are ase-insensitive
-                if (String.CASE_INSENSITIVE_ORDER.compare(txt.getFirstLine(), tag) == 0
-                                || txt.startsWith(tag + " "))
+                if (String.CASE_INSENSITIVE_ORDER.compare(txt.getFirstLine().trim(), tag) == 0
+                                || txt.startsWith(tag + " ", true))
                         return true;