Changeset 131

Timestamp:

07/10/08 12:32:54 (16 years ago)

Author:

ra33

Message:

Fixed a couple of minor repaint issues such problems when TwoEnclosed areas of identical size where on a vector frame

Also fixed cutting and pasting...

Added functionality to be able to cut and paste a selected region in a text item

Location:

trunk/src/org/expeditee

Files:

• gui/FrameGraphics.java (modified) (3 diffs)
• gui/FrameKeyboardActions.java (modified) (3 diffs)
• gui/FrameMouseActions.java (modified) (2 diffs)
• items/Item.java (modified) (4 diffs)
• items/Line.java (modified) (2 diffs)
• items/Text.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
+import org.expeditee.items.Permission;
 import org.expeditee.items.WidgetEdge;
 import org.expeditee.items.XRayable;
@@ -599 +600 @@
                                 int cmp = aArea.compareTo(bArea);
                                 if (cmp == 0) {
-                                        return new Integer(a.getID()).compareTo(b.getID());
+                                        //System.out.println(a.getEnclosureID() + " " + b.getID());
+                                        return new Integer(a.getEnclosureID()).compareTo(b.getEnclosureID());
                                 }
                                 return cmp * -1;
@@ -662 +664 @@
                         // For polygons need to make sure all other endpoints are
                         // unHighlighted
-                        changeHighlightMode(i, Item.HighlightMode.Normal,
-                                        Item.HighlightMode.None);
+                        if(i.hasPermission(Permission.full))
+                                changeHighlightMode(i, Item.HighlightMode.Normal,
+                                                Item.HighlightMode.None);
+                        else
+                                changeHighlightMode(i, Item.HighlightMode.Connected,
+                                                Item.HighlightMode.Connected);
                 }
                 Repaint();

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

@@ -476 +476 @@
                         return;
 
-                String text = "";
-
-                List<String> lines = ((Text) on).getTextList();
-                for (String s : lines)
-                        text += s + "\n";
-                // remove the last '\n'
-                text = text.substring(0, text.length() - 1);
-
+                Text text = (Text)on;
+                String string = text.copySelectedText();
+                
+                if(string.length() == 0)
+                        string = text.getText();
+                
                 // add the text of the item to the clipboard
-                StringSelection selection = new StringSelection(text);
+                StringSelection selection = new StringSelection(string);
                 Toolkit.getDefaultToolkit().getSystemClipboard().setContents(selection,
                                 null);
@@ -589 +587 @@
                                         List<Item> clipboard = new ArrayList<Item>();
                                         clipboard.add(text);
-                                        Collection<Item> left = FrameMouseActions.merge(clipboard,
+                                        FrameMouseActions.merge(clipboard,
                                                         clicked);
-                                        FrameMouseActions.anchor(left);
+                                        text.delete();
                                 } else {
 
@@ -665 +663 @@
                         }
                         copyItemToClipboard(current);
+                        if(current instanceof Text && ((Text)current).hasSelection()){
+                                ((Text)current).cutSelectedText();
+                                ((Text)current).clearSelection();
+                        }else{
                         FrameMouseActions.delete(current);
+                        }
                         return;
                 } else if (key == KeyEvent.VK_M) {

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

@@ -387 +387 @@
 
                         if (depressTime < MINIMUM_RANGE_DEPRESS_TIME
-                                        || lastRanged.getSelectedSize() <= 0) {// Text.MINIMUM_RANGED_CHARS)
+                                        || lastRanged.getSelectionSize() <= 0) {// Text.MINIMUM_RANGED_CHARS)
                                 // {
                                 lastRanged.clearSelection();
@@ -516 +516 @@
                                 }
                                 // if the entire text is selected then pickup the item
-                                if (lastRanged.getSelectedSize() == lastRanged.getLength()) {
+                                if (lastRanged.getSelectionSize() == lastRanged.getLength()) {
                                         pickup(lastRanged);
                                         lastRanged.clearSelection();

trunk/src/org/expeditee/items/Item.java

@@ -760 +760 @@
 
         protected Color getPaintHighlightColor() {
+                Color highlightColor = _highlightColor;
+                if (getPaintBackgroundColor().equals(highlightColor))
+                        highlightColor = ALTERNATE_HIGHLIGHT;
                 if (getParent() != null
-                                && getParent().getPaintBackgroundColor()
-                                                .equals(_highlightColor))
-                        return getParent().getPaintForegroundColor();
-
-                return _highlightColor;
+                                && getParent().getPaintBackgroundColor().equals(highlightColor))
+                        highlightColor = getParent().getPaintForegroundColor();
+
+                return highlightColor;
         }
 
@@ -1111 +1113 @@
 
         public void setActionMark(boolean val) {
+                if (!val)
+                        invalidateCommonTrait(ItemAppearence.LinkChanged);
                 _poly = null;
                 _actionMark = val;
-                invalidateCommonTrait(ItemAppearence.LinkChanged);
+                if (val)
+                        invalidateCommonTrait(ItemAppearence.LinkChanged);
         }
 
@@ -1891 +1896 @@
                         invalidateCommonTrait(ItemAppearence.LinkChanged);
                 }
-                if(_actions == null || _actions.size() == 0) {
+                if (_actions == null || _actions.size() == 0) {
                         _poly = null;
                         _actions = new LinkedList<String>();
-                }else{
+                } else {
                         _actions.clear();
                 }
@@ -2079 +2084 @@
                 return box.getWidth() * box.getHeight();
         }
+        
+        public int getEnclosureID(){
+                return _enclosure.hashCode();
+        }
 
         /**

trunk/src/org/expeditee/items/Line.java

@@ -21 +21 @@
 import org.expeditee.gui.Frame;
 
+import sun.misc.Perf.GetPerfAction;
+
 /**
  * Implements a line that is drawn on the screen. A line is represented as two
@@ -494 +496 @@
 
         public Item getEndPointToDisconnect(int x, int y) {
+                if(!hasPermission(Permission.full))
+                        return null;
+                
                 Item start = getStartItem();
                 Item end = getEndItem();

trunk/src/org/expeditee/items/Text.java

@@ -490 +490 @@
         }
 
-        public int getSelectedSize() {
+        public int getSelectionSize() {
                 if (_selectionEnd < 0 || _selectionStart < 0)
                         return 0;
@@ -1760 +1760 @@
                 return ItemUtils.startsWithTag(this, "@ao") ||ItemUtils.startsWithTag(this, "@v");
         }
+
+        public boolean hasSelection() {
+                return getSelectionSize() > 0;
+        }
 }