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

Timestamp:

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

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameKeyboardActions.java (modified) (12 diffs)

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

@@ -10 +10 @@
 import java.awt.event.KeyListener;
 import java.awt.geom.Point2D;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39 +40 @@
 
         private static Collection<Item> _enclosedItems = null;
-        
+
         public static void resetEnclosedItems() {
                 _enclosedItems = null;
@@ -330 +331 @@
         public void keyPressed(KeyEvent e) {
                 int keyCode = e.getKeyCode();
-                
-                if(keyCode != KeyEvent.VK_F1 && keyCode != KeyEvent.VK_F2){
+
+                if (keyCode != KeyEvent.VK_F1 && keyCode != KeyEvent.VK_F2) {
                         resetEnclosedItems();
                 }
-                
+
                 SessionStats.AddFrameEvent("k" + KeyEvent.getKeyText(keyCode));
 
@@ -526 +527 @@
 
         }
-
 
         public void keyReleased(KeyEvent e) {
@@ -1114 +1114 @@
         public static final String SHORT_DATE_FORMAT = "ddMMMyyyy";
 
+        public static final String TIME_DATE_FORMAT = "[HH:mm]";
+
         public static final String LONG_DATE_FORMAT = "ddMMMyyyy[HH:mm]";
 
@@ -1181 +1183 @@
                                 dummyItem.setText(newItemText + dummyItem.getText());
                         }
-                        
+
                         dummyItem = createText();
                         if (FreeItems.textOnlyAttachedToCursor()) {
@@ -1199 +1201 @@
                         if (column.size() == 0) {
                                 Frame current = DisplayIO.getCurrentFrame();
-                                //Item itemTemplate = current.getItemTemplate();
+                                // Item itemTemplate = current.getItemTemplate();
                                 int xPos = title.getX() + FrameCreator.INDENT_FROM_TITLE;
                                 int yPos = FrameCreator.getYStart(title);
@@ -1509 +1511 @@
                         // check permissions
                         if (!item.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to change the size of that item");
-                                return;
+                                Item editTarget = item.getEditTarget();
+                                if (editTarget != item
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        item = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to change the size of that item");
+                                        return;
+                                }
                         }
                         toSet = item;
@@ -1569 +1577 @@
                                         i.setThickness((float) (i.getThickness() * ratio));
                                 } else if (i instanceof XRayable) {
+                                        XRayable xRay = (XRayable) i;
+                                        Text source = xRay.getSource();
+                                        // Ensure that the source is done before the XRayable
+                                        if (!done.contains(source)) {
+                                                scaleText(origin, ratio, done, source);
+                                        }
+
                                         i.translate(origin, ratio);
                                         i.setThickness((float) (i.getThickness() * ratio));
                                         done.add(i);
+                                } else if (i.hasVector()) {
+                                        // TODO Improve the effiency of resizing vectors... ie...
+                                        // dont want to have to reparse all the time
+                                        assert (i instanceof Text);
+                                        Text text = (Text) i;
+                                        AttributeValuePair avp = new AttributeValuePair(text
+                                                        .getText());
+                                        double scale = 1F;
+                                        try {
+                                                scale = avp.getDoubleValue();
+                                        } catch (Exception e) {
+                                        }
+                                        scale *= ratio;
+                                        NumberFormat nf = Vector.getNumberFormatter();
+                                        text.setAttributeValue(nf.format(scale));
+                                        text.translate(origin, ratio);
+                                        item.getParent().parse();
                                 } else if (i instanceof Text) {
-                                        i.translate(origin, ratio);
-                                        i.setSize((float) (i.getSize() * ratio));
-                                        done.add(i);
+                                        scaleText(origin, ratio, done, (Text) i);
                                 }
                         }
@@ -1598 +1628 @@
                                 current = Math.max(current + diff, Item.MINIMUM_THICKNESS);
                                 dot.setThickness(current);
+                        } else if (i.hasVector()) {
+                                assert (item instanceof Text);
+                                Text text = (Text) item;
+                                AttributeValuePair avp = new AttributeValuePair(text.getText());
+                                double scale = 1F;
+                                try {
+                                        scale = avp.getDoubleValue();
+                                } catch (Exception e) {
+                                }
+                                scale *= ratio;
+                                NumberFormat nf = Vector.getNumberFormatter();
+                                text.setAttributeValue(nf.format(scale));
+                                text.translate(origin, ratio);
+                                item.getParent().parse();
                         } else {
                                 float oldSize = Math.abs(i.getSize());
@@ -1620 +1664 @@
         }
 
+        /**
+         * @param origin
+         * @param ratio
+         * @param done
+         * @param source
+         */
+        private static void scaleText(Point2D origin, double ratio,
+                        Collection<Item> done, Text source) {
+                source.translate(origin, ratio);
+                source.setSize((float) (source.getSize() * ratio));
+                done.add(source);
+        }
+
         private static void SetFillColor(Item item, boolean setTransparent) {
                 if (item == null)
@@ -1716 +1773 @@
                         // check permissions
                         if (!item.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to change that item's color");
-                                return;
+                                Item editTarget = item.getEditTarget();
+                                if (editTarget != item
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        item = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to change color");
+                                        return;
+                                }
                         }
                         // Toggling color of circle center changes the circle fill color