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

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -246 +246 @@
 
                 for (Item i : current.getItems())
-                        i.showHighlight(false);
+                        i.setSelectedMode(Item.SelectedMode.None);
                 return true;
         }
@@ -354 +354 @@
                 _LastResponse = ResponseTimer.getElapsedSeconds();
                 _ResponseTimeSum += _LastResponse;
+                DisplayIO.UpdateTitle();
         }
 
@@ -454 +455 @@
                 return true;
         }
-        
+
         /**
-         * Creates an interactive widget and adds it to a frame.
-         * If txt has no parent the parent will be set to frame.
-         * 
-         * @param frame 
-         *              Frame to add widget to. Must not be null.
-         * 
-         * @param txt 
-         *              Text to create the widget from. Must not be null.
+         * Creates an interactive widget and adds it to a frame. If txt has no
+         * parent the parent will be set to frame.
+         * 
+         * @param frame
+         *            Frame to add widget to. Must not be null.
+         * 
+         * @param txt
+         *            Text to create the widget from. Must not be null.
          * 
          * @return True if created/added. False if coul not create.
@@ -471 +472 @@
         private static boolean createWidget(Frame frame, Text txt) {
 
-                if (frame == null) throw new NullPointerException("frame");
-                if (txt == null) throw new NullPointerException("txt");
-                
+                if (frame == null)
+                        throw new NullPointerException("frame");
+                if (txt == null)
+                        throw new NullPointerException("txt");
+
                 // Safety
-                if (txt.getParent() == null) txt.setParent(frame);
-                
+                if (txt.getParent() == null)
+                        txt.setParent(frame);
+
                 InteractiveWidget iw = null;
-                
+
                 try {
-                        
+
                         iw = InteractiveWidget.CreateWidget(txt);
-                        
+
                 } catch (InteractiveWidgetNotAvailableException e) {
                         e.printStackTrace();
-                        FrameGraphics.ErrorMessage("Cannot create iWidget: " + e.getMessage());
-                        
-                }  catch (IllegalArgumentException e) {
+                        FrameGraphics.ErrorMessage("Cannot create iWidget: "
+                                        + e.getMessage());
+
+                } catch (IllegalArgumentException e) {
                         e.printStackTrace();
-                        FrameGraphics.ErrorMessage("Cannot create iWidget: " + e.getMessage());
-                }
-                
-                if (iw == null) return false;
+                        FrameGraphics.ErrorMessage("Cannot create iWidget: "
+                                        + e.getMessage());
+                }
+
+                if (iw == null)
+                        return false;
 
                 frame.removeItem(txt);
-                
+
                 frame.addAllItems(iw.getItems());
 
@@ -682 +689 @@
                 // if XRayMode is on, replace pictures with their underlying text
                 if (FrameGraphics.isXRayMode()) {
-                        
+
                         // BROOK: Must handle these a little different
-                        //List<InteractiveWidget> widgets = toParse.getInteractiveWidgets();
+                        // List<InteractiveWidget> widgets =
+                        // toParse.getInteractiveWidgets();
                         ArrayList<InteractiveWidget> widgets = new ArrayList<InteractiveWidget>();
                         /*
+                         * for (Item i : items) { if (i instanceof Picture) {
+                         * toParse.removeItem(i); toParse.addItem(((Picture) i).getText()); }
+                         * else if (i instanceof WidgetCorner) { toParse.removeItem(i); }
+                         * else if (i instanceof WidgetEdge) { toParse.removeItem(i); } }
+                         */
                         for (Item i : items) {
                                 if (i instanceof Picture) {
@@ -693 +706 @@
                                 } else if (i instanceof WidgetCorner) {
                                         toParse.removeItem(i);
-                                } else if (i instanceof WidgetEdge) {
-                                        toParse.removeItem(i);
-                                }
-                        }*/
-                        for (Item i : items) {
-                                if (i instanceof Picture) {
-                                        toParse.removeItem(i);
-                                        toParse.addItem(((Picture) i).getText());
-                                } else if (i instanceof WidgetCorner) {
-                                        toParse.removeItem(i);
-                                        InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
-                                        if (!widgets.contains(iw)) { // hmmm I should be using a set... meh
+                                        InteractiveWidget iw = ((WidgetCorner) i).getWidgetSource();
+                                        if (!widgets.contains(iw)) { // hmmm I should be using a
+                                                // set... meh
                                                 widgets.add(iw);
                                         }
-                                } else if (i instanceof WidgetEdge) toParse.removeItem(i);
-                        }
-
+                                } else if (i instanceof WidgetEdge)
+                                        toParse.removeItem(i);
+                        }
 
                         for (InteractiveWidget iw : widgets) {
                                 toParse.addItem(iw.getSource());
                         }
-                        
+
                         // update the list of items
                         items.clear();
@@ -918 +922 @@
                                         if (message.contains(x, y)) {
                                                 message.Permission = Item.PERMISSION_COPY;
-                                        }
-                                        possibles.add(message);
+                                                possibles.add(message);
+                                        } else
+                                                // Not sure why but if the line below is removed then
+                                                // several items can be highlighted at once
+                                                message.setSelectedMode(Item.SelectedMode.None);
                                 }
                         }
@@ -927 +934 @@
                                 if (FrameGraphics.MessageLink.contains(x, y)) {
                                         FrameGraphics.MessageLink.Permission = Item.PERMISSION_COPY;
-                                }
-                                possibles.add(FrameGraphics.MessageLink);
-                        }
-                        y -= FrameGraphics.getMaxFrameSize().getHeight();
+                                        possibles.add(FrameGraphics.MessageLink);
+                                }
+                        }
+
+                        // this is taken into account in contains
+                        // y -= FrameGraphics.getMaxFrameSize().height;
                         // otherwise, the mouse is on the frame
                 } else {
@@ -942 +951 @@
                         } else
                                 LastEdited = null;
-                        
+
                         ArrayList<Item> checkList = new ArrayList<Item>();
                         checkList.addAll(toCheck.getItems());
@@ -1028 +1037 @@
                         return null;
 
-                return getItemsEnclosedBy(DisplayIO.getCurrentFrame(), enclosure.get(0)
-                                .getEnclosedShape());
+                List<Item> enclosed = getItemsEnclosedBy(DisplayIO.getCurrentFrame(),
+                                enclosure.get(0).getEnclosedShape());
+                for (Item i : enclosed) {
+                        if (!enclosure.contains(i))
+                                i.setSelectedMode(Item.SelectedMode.None);
+                }
+
+                return enclosed;
         }
 
@@ -1123 +1138 @@
                         // if the item is on the frame
                         if (item.getParent() == frame || item.getParent() == null) {
-                                // TODO this is a bit of a hack...
-                                // the
-                                // item
-                                // parent
-                                // should
-                                // really
-                                // be
-                                // set
-                                // when
-                                // the
-                                // polygon
-                                // is
-                                // created...
                                 item.Permission = Item.PERMISSION_FULL;
                                 results.add(item);