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

Timestamp:

07/02/08 12:38:54 (16 years ago)

Author:

ra33

Message:

added functionality for dockable @v's

File:

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

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

@@ -45 +45 @@
         private static float _LastResponse = 0;
 
-        public static Text LastEdited = null;
+        private static Text LastEdited = null;
 
         public static int MINIMUM_INTERITEM_SPACING = -6;
@@ -256 +256 @@
 
                 for (Item i : current.getItems())
-                        i.setSelectedMode(Item.SelectedMode.None);
+                        i.setHighlightMode(Item.HighlightMode.None);
                 return true;
         }
@@ -274 +274 @@
 
                         // if the two frames both have changes, prompt the user for the
-                        // next
-                        // move
+                        // next move
                         if (opposite.hasChanged() && opposite.equals(toSave)) {
                                 if (DisplayIO.DisplayConfirmDialog(
@@ -287 +286 @@
                                 } else
                                         return false;
-                        } else if (opposite.getOverlays().contains(
-                                        new Overlay(toSave, Permission.followLinks))) {
-                                if (opposite.getOverlays().get(
-                                                opposite.getOverlays().indexOf(
-                                                                new Overlay(toSave, Permission.followLinks))).Frame
-                                                .hasChanged())
+                        } else if (opposite.hasOverlay(toSave)) {
+                                if (toSave.hasChanged())
                                         if (DisplayIO.DisplayConfirmDialog(
                                                         "Leaving this frame will discard changes made in the "
@@ -637 +632 @@
                 }
         }
-        
+
         public static void loadFirstFrame(Frame profile) {
                 if (UserSettings.FirstFrame == null)
@@ -643 +638 @@
                 else {
                         Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
-                        if ( firstFrame == null) {
+                        if (firstFrame == null) {
                                 FrameGraphics.WarningMessage("Home frame not found: "
                                                 + UserSettings.FirstFrame);
                                 UserSettings.FirstFrame = profile.getName();
                                 DisplayIO.setCurrentFrame(profile);
-                        }else{
+                        } else {
                                 DisplayIO.setCurrentFrame(firstFrame);
                         }
@@ -812 +807 @@
                                         // Show the items
                                         for (Item item : ((XRayable) i).getConnected()) {
-                                                item.setHidden(false);
+                                                item.setVisible(true);
                                                 item.removeEnclosure(i);
                                         }
@@ -877 +872 @@
                                                 // @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.getAnnotationValue("permission"),
+                                                                Permission.none);
+                                                // If the frame permission is lower, use that
+                                                vectorPermission = Permission.min(vectorPermission,
+                                                                permission);
+                                                //Highest permissable permission for vectors is copy
+                                                vectorPermission = Permission.min(vectorPermission, Permission.copy);
                                                 if (vector != null) {
                                                         String scaleString = AttributeUtils
@@ -885 +889 @@
                                                         } catch (Exception e) {
                                                         }
-                                                        vectors
-                                                                        .add(new Vector(vector, i.getPosition(),
-                                                                                        scale, i.getColor(), i
-                                                                                                        .getBackgroundColor()));
+                                                        vectors.add(new Vector(vector, vectorPermission, i
+                                                                        .getPosition(), scale, i.getColor(), i
+                                                                        .getBackgroundColor()));
                                                 }
                                         }
-
                                         // check for new OVERLAY items
                                         else if (ItemUtils.startsWithTag(i, ItemUtils.TAG_OVERLAY)
@@ -954 +956 @@
                                                         if (ItemUtils.startsWithTag(i, ItemUtils.TAG_IMAGE,
                                                                         true)) {
-                                                                createPicture(toParse, (Text) i);
+                                                                if (!i.hasEnclosures()) {
+                                                                        createPicture(toParse, (Text) i);
+                                                                }
                                                                 // check for frame images
                                                         } else if (ItemUtils.startsWithTag(i,
@@ -962 +966 @@
                                                                                         toParse.getName())) {
                                                                 XRayable image = null;
-                                                                if (i.getEnclosures().size() > 0) {
-                                                                        i.setHidden(true);
-                                                                        image = i.getEnclosures().iterator().next();
-                                                                        image.refresh();
+                                                                if (i.hasEnclosures()) {
+                                                                        // i.setHidden(true);
+                                                                        // image =
+                                                                        // i.getEnclosures().iterator().next();
+                                                                        // image.refresh();
                                                                 } else {
-                                                                        image = new FrameImage((Text) i, toParse, null);
+                                                                        image = new FrameImage((Text) i, toParse,
+                                                                                        null);
                                                                 }
-                                                                //TODO Add the image when creating new FrameImage
+                                                                // TODO Add the image when creating new
+                                                                // FrameImage
                                                                 toParse.addItem(image);
                                                         } else if (ItemUtils.startsWithTag(i,
@@ -977 +984 @@
                                                                                         toParse.getName())) {
                                                                 XRayable image = null;
-                                                                if (i.getEnclosures().size() > 0) {
-                                                                        image = i.getEnclosures().iterator().next();
-                                                                        image.refresh();
-                                                                        i.setHidden(true);
+                                                                if (i.hasEnclosures()) {
+                                                                        // image =
+                                                                        // i.getEnclosures().iterator().next();
+                                                                        // image.refresh();
+                                                                        // i.setHidden(true);
                                                                 } else {
                                                                         // If a new bitmap is created for a
                                                                         // frame which already has a bitmap dont
                                                                         // recreate the bitmap
-                                                                        image = new FrameBitmap((Text) i, toParse, null);
+                                                                        image = new FrameBitmap((Text) i, toParse,
+                                                                                        null);
                                                                 }
                                                                 toParse.addItem(image);
                                                         } else if (ItemUtils.startsWithTag(i, "@c")) {
                                                                 // Can only have a @c
-                                                                if (i.getLines().size() == 1) {
+                                                                if (!i.hasEnclosures()
+                                                                                && i.getLines().size() == 1) {
                                                                         toParse.addItem(new Circle((Text) i));
                                                                 }
@@ -1091 +1101 @@
                                                 message.setPermission(Permission.copy);
                                                 possibles.add(message);
-                                        } else{
+                                        } else {
                                                 // Not sure why but if the line below is removed then
                                                 // several items can be highlighted at once
-                                                message.setSelectedMode(Item.SelectedMode.None);
+                                                message.setHighlightMode(Item.HighlightMode.None);
                                         }
                                 }
@@ -1111 +1121 @@
                         // otherwise, the mouse is on the frame
                 } else {
-                        if (LastEdited != null && /*LastEdited.isVisible()
-                                        &&*/ LastEdited.contains(x, y)
+                        if (LastEdited != null && /*
+                                                                                 * LastEdited.isVisible() &&
+                                                                                 */LastEdited.contains(x, y)
                                         && !Frame.FreeItems.contains(LastEdited)
                                         && LastEdited.getParent() == DisplayIO.getCurrentFrame()
@@ -1118 +1129 @@
                                 LastEdited.setPermission(Permission.full);
                                 return LastEdited;
-                        } else
-                                LastEdited = null;
-
+                        } else {
+                                setLastEdited(null);
+                        }
                         ArrayList<Item> checkList = new ArrayList<Item>();
-                        checkList.addAll(toCheck.getVisibleItems());
+                        checkList.addAll(toCheck.getAllItems());
                         checkList.add(toCheck.getNameItem());
                         for (Item i : checkList) {
                                 // do not check annotation items in audience mode
-                                if (!(FrameGraphics.isAudienceMode() && i.isAnnotation())) {
+                                if (i.isVisible() && !(FrameGraphics.isAudienceMode() && i.isAnnotation())) {
                                         if (i.contains(x, y) && !Frame.FreeItems.contains(i)) {
-                                                possibles.add(i);
-                                        }
-                                }
-                        }
-                        Permission framePermission = toCheck.getPermission();
-                        for (Overlay o : toCheck.getOverlays()) {
-                                if (o.Level.ordinal() > Permission.none.ordinal()) {
-                                        Item i = onItem(o.Frame, x, y);
-
-                                        // the message is included above with full permissions,
-                                        // it should be ignored here
-                                        if (i != null && i.getID() > 0) {
-                                                i.setPermission(Permission
-                                                                .min(o.Level, framePermission));
                                                 possibles.add(i);
                                         }
@@ -1206 +1203 @@
                         // Dont want to loose the highlighting from the current item
                         if (i != currentItem && !enclosure.contains(i))
-                                i.setSelectedMode(Item.SelectedMode.None);
+                                i.setHighlightMode(Item.HighlightMode.None);
                         if (i instanceof WidgetCorner) {
                                 if (!enclosedWidgets.contains(((WidgetCorner) i)
@@ -1312 +1309 @@
         }
 
-        //TODO Remove this method!!
-        //We should be able to get by with just getItemsWithin
+        // TODO Remove this method!!
+        // Can just getItemsWithin be used?
         public static Collection<Item> getItemsEnclosedBy(Frame frame, Polygon poly) {
                 Collection<Item> contained = frame.getItemsWithin(poly);
@@ -1329 +1326 @@
                                 for (Overlay overlay : frame.getOverlays())
                                         if (overlay.Frame == item.getParent()) {
-                                                item.setPermission(overlay.Level);
+                                                item.setPermission(overlay.permission);
                                                 results.add(item);
                                                 break;
@@ -1463 +1460 @@
 
         public static void setLastEdited(Text lastEdited) {
-                if(LastEdited != null && LastEdited.getText().length() == 0){
+                if (LastEdited != null && lastEdited != LastEdited
+                                && LastEdited.getText().length() == 0) {
                         LastEdited.getParentOrCurrentFrame().removeItem(LastEdited);
                 }
                 LastEdited = lastEdited;
         }
+
+        public static Text getLastEdited() {
+                return LastEdited;
+        }
 }