Changeset 336 for trunk/src/org/expeditee/gui/FrameUtils.java

Timestamp:

09/26/08 13:03:26 (16 years ago)

Author:

ra33

Message:

Fixed minor bugs

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (5 diffs)

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

@@ -585 +585 @@
                         else if (attribute.equals("networksettings"))
                                 FrameShare.init(item.getChild());
-                        else if (attribute.equals("greenstonesettings"))
+                        else if (attribute.equals("greenstonesettings")) {
                                 SearchGreenstone.init(item.getChild());
-                        else if (attribute.equals("reminders"))
+                        } else if (attribute.equals("reminders"))
                                 Reminders.init(item.getChild());
                         else if (attribute.equals("antialias"))
@@ -811 +811 @@
                                 } else if (i.hasOverlay()) {
                                         i.setVisible(true);
-                                        //int x = i.getBoundsHeight();
+                                        // int x = i.getBoundsHeight();
                                 }
                         }
@@ -873 +873 @@
                                                                                 ItemUtils.TAG_VECTOR)
                                                                 && i.getLink() != null) {
-                                                        addVector(vectors, Permission.none, permission, i);
+                                                        if (!i.getAbsoluteLink().equals(toParse.getName()))
+                                                                addVector(vectors, Permission.none, permission,
+                                                                                i);
                                                 } else if (!FrameGraphics.isXRayMode()
                                                                 && ItemUtils.startsWithTag(i,
                                                                                 ItemUtils.TAG_ACTIVE_VECTOR)
                                                                 && i.getLink() != null) {
-                                                        addVector(vectors, Permission.followLinks,
-                                                                        permission, i);
+                                                        if (!i.getAbsoluteLink().equals(toParse.getName()))
+                                                                addVector(vectors, Permission.followLinks,
+                                                                                permission, i);
                                                 }
                                                 // check for new OVERLAY items
@@ -1032 +1035 @@
                         // thread-safe protocol for this project...
                         toParse.clearOverlays();
+                        toParse.clearVectors();
                         toParse.addAllOverlays(overlays);
-                        toParse.clearVectors();
                         toParse.addAllVectors(vectors);
                 }
@@ -1049 +1052 @@
                 // @v which points back to the frame with the @ao
                 Frame vector = FrameIO.LoadFrame(i.getAbsoluteLink());
+
                 // Get the permission from off the vector frame
                 Permission vectorPermission = Permission.getPermission(vector