Changeset 286 for trunk/src/org/expeditee/gui/FrameMouseActions.java

Timestamp:

08/29/08 08:17:54 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (15 diffs)

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

@@ -2 +2 @@
 
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -10 +11 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -683 +685 @@
                         // check item permissions
                         if (!clicked.hasPermission(Permission.followLinks)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permissions to perform action on item");
-                                return;
+                                Item editTarget = clicked.getEditTarget();
+                                if (editTarget != clicked
+                                                && editTarget.hasPermission(Permission.followLinks)) {
+                                        clicked = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to perform action on item");
+                                        return;
+                                }
                         }
 
@@ -869 +877 @@
                         // check permissions
                         if (!clicked.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to pick up item");
-                                return;
+                                Item editTarget = clicked.getEditTarget();
+                                if (editTarget != clicked
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        clicked = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to pick up item");
+                                        return;
+                                }
                         }
 
@@ -1250 +1264 @@
                                         }
                                 } else if (!clicked.hasPermission(Permission.copy)) {
-                                        MessageBay
-                                                        .displayMessage("Insufficient permission to copy");
-                                        return;
+                                        Item editTarget = clicked.getEditTarget();
+                                        if (editTarget != clicked
+                                                        && editTarget.hasPermission(Permission.copy)) {
+                                                clicked = editTarget;
+                                        } else {
+                                                MessageBay
+                                                                .displayMessage("Insufficient permission to copy");
+                                                return;
+                                        }
                                 }
 
@@ -1548 +1568 @@
 
         private static boolean _controlDown;
-        
+
         public static boolean isControlDown() {
                 return _controlDown;
@@ -1596 +1616 @@
                 MouseX = e.getX();
                 MouseY = e.getY();
-                //System.out.println(MouseX + "," + MouseY);
+                // System.out.println(MouseX + "," + MouseY);
 
                 // Moving the mouse a certain distance removes the last edited text if
@@ -1813 +1833 @@
                                 // Item.SelectedMode.Connected);
                                 // TODO: The method below is for the most part redundant
-                                on = FrameGraphics.Highlight(on);
+                                on = FrameGraphics.Highlight(on.getEditTarget());
                         }
                         // if the last item highlighted is still highlighted, clear it
@@ -2001 +2021 @@
          */
         public static boolean tdfc(Item linker) throws RuntimeException {
-                // if (linker instanceof Line)
-                // return false;
-
                 // if this is a non-usable item
                 if (linker.getID() < 0)
                         return false;
+
+                // Check if its an image that can be resized to fit a box
+                // around it
+                String text = linker.getText();
+                if (text.equals("@v") || text.equals("@f")) {
+                        Collection<Item> enclosure = FrameUtils.getEnclosingLineEnds(linker
+                                        .getPosition());
+                        if (enclosure != null) {
+                                for (Item i : enclosure) {
+                                        if (i.isLineEnd() && i.isEnclosed()) {
+                                                DisplayIO.getCurrentFrame().removeAllItems(enclosure);
+                                                Rectangle rect = i.getEnclosedRectangle();
+                                                long width = Math.round(rect.getWidth());
+                                                if (text.equals("@v")) {
+                                                        NumberFormat nf = Vector.getNumberFormatter();
+                                                        linker.setText("@v: "
+                                                                        + nf.format((width / FrameGraphics
+                                                                                        .getMaxFrameSize().getWidth())));
+                                                } else {
+                                                        linker.setText("@f: " + width);
+                                                }
+
+                                                linker.setPosition(new Point(rect.x, rect.y));
+                                                linker.setThickness(i.getThickness());
+                                                linker.setBorderColor(i.getColor());
+                                                break;
+                                        }
+                                }
+                                FrameMouseActions.deleteItems(enclosure, false);
+                        }
+                }
 
                 boolean mouseMoved;
@@ -2178 +2226 @@
                         // check permissions
                         if (!toDelete.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to delete item");
-                                return;
+                                Item editTarget = toDelete.getEditTarget();
+                                if (editTarget != toDelete
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        toDelete = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to delete item");
+                                        return;
+                                }
                         }
 
@@ -2532 +2586 @@
 
                 if (!toGrab.hasPermission(Permission.full)) {
-                        MessageBay
-                                        .displayMessage("Insufficient permission pickup the item");
+                        if (toGrab.getEditTarget() != toGrab) {
+                                pickup(toGrab.getEditTarget());
+                        } else {
+                                MessageBay
+                                                .displayMessage("Insufficient permission pickup the item");
+                        }
                         return;
                 }
@@ -2539 +2597 @@
                 if (toGrab instanceof Circle)
                         toGrab.setHighlightMode(HighlightMode.Connected);
-                else
+                //Dont set the highlight mode if a vector is being picked up
+                else if(toGrab.isVisible()){
                         toGrab.setHighlightMode(HighlightMode.Normal);
+                }
 
                 // Brook: If the widget corner is being picked up. Instead refer to
@@ -2559 +2619 @@
 
         public static void pickup(Collection<Item> toGrab) {
-                if(toGrab == null || toGrab.size() == 0)
+                if (toGrab == null || toGrab.size() == 0)
                         return;
-                
+
                 boolean bReparse = false;
                 Frame frame = DisplayIO.getCurrentFrame();
@@ -2594 +2654 @@
                                 for (Item copy : copies) {
                                         FreeItems.getInstance().add(copy);
+                                        copy.setEditTarget(i);
                                         copy.setFloating(true);
                                         copy.setParent(null);
+                                        //copy.setHighlightMode(HighlightMode.Connected);
                                 }
                         }
@@ -2636 +2698 @@
                 } else {
                         MessageBay
-                                        .displayMessage("Insufficient permission pickup the items");
+                                        .displayMessage("Insufficient permission to pickup the items");
                 }
                 if (bReparse)