Changeset 137

Timestamp:

07/14/08 10:05:43 (16 years ago)

Author:

ra33

Message:

Fixed a few problems with painting etc.. and finished search stuff

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (2 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameGraphics.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (3 diffs)
• gui/MessageBay.java (modified) (1 diff)
• items/Item.java (modified) (4 diffs)
• items/Text.java (modified) (24 diffs)

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

@@ -80 +80 @@
 
                 UserSettings.Init();
+                
                 UserSettings.Username = FrameIO.ConvertToValidFramesetName(System
                                 .getProperty("user.name"));
@@ -94 +95 @@
                         }
                 }
+                
                 FrameUtils.ParseProfile(profile);
                 

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

@@ -61 +61 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp02Jul2008A";
+        public static final String TITLE = "Exp10Jul2008A";
 
         private DisplayIO() {

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

@@ -34 +34 @@
 
         // the maximum size that can be used to paint on
-        private static Dimension _MaxSize;
+        private static Dimension _MaxSize = new Dimension(1000,1000);
 
         // modes

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

@@ -229 +229 @@
                 // System.out.println("MousePressed " + e.getX() + "," + e.getY() + " "
                 // + e.getWhen());
-                
+
                 // Auto-hide popups when user clicks into expeditee world
                 PopupManager.hideAllPopups();
@@ -2420 +2420 @@
                         if (i.hasVector()) {
                                 bReparse = true;
-                                // Frame overlayFrame = FrameIO.LoadFrame(i.getAbsoluteLink());
-                                // Collection<Item> copies = ItemUtils.CopyItems(overlayFrame
-                                // .getNonAnnotationItems(), i.getVector());
-                                // FreeItems.getInstance().addAll(copies);
-                                // TODO add the copies to the free items so they are visible
-                                // when the cursor is moving around but are not anchored
+
+                                Frame overlayFrame = FrameIO.LoadFrame(i.getAbsoluteLink());
+                                Collection<Item> copies = ItemUtils.CopyItems(overlayFrame
+                                                .getNonAnnotationItems(), i.getVector());
+                                for(Item copy: copies){
+                                        FreeItems.getInstance().add(copy);
+                                        copy.setFloating(true);
+                                        copy.setParent(null);
+                                }
                         }
                 }
@@ -2508 +2511 @@
 
         public static void anchor(Item toAnchor, boolean checkEnclosure) {
+                //Only anchor items we have full permission over... ie dont anchor vector items
+                if(!toAnchor.hasPermission(Permission.full))
+                        return;
+                
                 toAnchor.anchor();
 

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

@@ -124 +124 @@
 
         public static void invalidateFullBay() {
+                if(_messageBuffer == null)
+                        return;
+                
                 _dirtyAreas.clear();
                 addDirtyArea(new Rectangle(0, FrameGraphics.getMaxFrameSize().height,

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

@@ -175 +175 @@
 
                 dest.setParent(source.getParent());
+                dest._overlay = source._overlay;
                 dest._mode = source._mode;// SelectedMode.None;
                 dest._visible = source._visible;
@@ -1696 +1697 @@
         public void setHighlightMode(HighlightMode mode, Color color) {
                 setHighlightColor(color);
-                if (_mode != mode) {
-                        _mode = mode;
-                        this.invalidateCommonTrait(ItemAppearence.HighlightModeChanged);
+                if (hasPermission(Permission.followLinks)) {
+                        if (_mode != mode) {
+                                _mode = mode;
+                                this.invalidateCommonTrait(ItemAppearence.HighlightModeChanged);
+                        }
                 }
         }
@@ -1893 +1896 @@
                 return _actions != null && _actions.size() > 0;
         }
-        
+
         public void setAction(String action) {
                 // Want to resize the highlight box for text items if actions are been
@@ -1928 +1931 @@
                 boolean hasLink = getLink() != null;
                 boolean hasAction = hasAction();
-                
+
                 if (hasLink || hasAction) {
                         g.setStroke(HIGHLIGHT_STROKE);

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

@@ -38 +38 @@
 public class Text extends Item {
         public static String LINE_SEPARATOR = System.getProperty("line.separator");
-        public static char[] BULLETS = {'\u2219' , '\u2218', '\u2217'};
+
+        public static char[] BULLETS = { '\u2219', '\u2218', '\u2217' };
+
         private static char DEFAULT_BULLET = BULLETS[2];
+
         private static String DEFAULT_BULLET_STRING = DEFAULT_BULLET + " ";
-        
+
         private String[] _processedText = null;
 
@@ -97 +100 @@
 
         private int _selectionEnd = -1;
-        
+
         // text is broken up into lines
         private StringBuffer _text = new StringBuffer();
@@ -125 +128 @@
                 setID(id);
         }
-        
+
         /**
          * Creates a text item which is not added to the frame.
+         * 
          * @param text
          */
@@ -190 +194 @@
         }
 
-        
         /**
          * Sets the justification of this Text item. The given integer should
@@ -277 +280 @@
          */
         public void removeText(String text) {
-                
+
                 if (_text.length() > 0 && _text.indexOf(text) == 0) {
-                        //invalidateAll();
+                        // invalidateAll();
                         _text.delete(0, text.length());
                 }
-                
 
         }
@@ -289 +291 @@
                 int length = _text.length();
                 if (length > 0) {
-                        //invalidateAll();
+                        // invalidateAll();
                         int pos = _text.indexOf(textToRemove);
                         int textToRemoveLength = textToRemove.length();
@@ -296 +298 @@
                         }
                 }
-                
+
         }
 
@@ -366 +368 @@
          */
         private char getNextBullet(char bullet) {
-                for(int i = 0; i < BULLETS.length - 1; i++){
-                        if(BULLETS[i]== bullet)
-                                return BULLETS[i+1];
+                for (int i = 0; i < BULLETS.length - 1; i++) {
+                        if (BULLETS[i] == bullet)
+                                return BULLETS[i + 1];
                 }
                 return BULLETS[0];
@@ -374 +376 @@
 
         private char getPreviousBullet(char bullet) {
-                for(int i = 1; i < BULLETS.length; i++){
-                        if(BULLETS[i]== bullet)
+                for (int i = 1; i < BULLETS.length; i++) {
+                        if (BULLETS[i] == bullet)
                                 return BULLETS[i - 1];
                 }
@@ -470 +472 @@
                 if (_selectionStart < 0 || _selectionEnd < 0)
                         return null;
-                
+
                 invalidateAll();
-                
+
                 if (_selectionEnd > _text.length())
                         _selectionEnd = _text.length();
@@ -484 +486 @@
                 _text.insert(left, newText);
                 rebuild(true);
-                
+
                 invalidateAll();
 
@@ -520 +522 @@
                 TextLayout current = null;
                 int line;
-                
+
                 invalidateAll();
 
@@ -617 +619 @@
                         }
 
-                        if (_text.length() == 0){
+                        if (_text.length() == 0) {
                                 rebuild(false);
                                 return new Point2D.Float(this._x, this._y);
@@ -664 +666 @@
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                
+
                 invalidateAll();
-                
+
                 return new Point2D.Float(Math.round(x), Math.round(getY() + y
                                 + caret[1]));
@@ -813 +815 @@
                 // rejustify();
                 rebuild(false);
-                
+
                 invalidateAll();
         }
@@ -1133 +1135 @@
         private void rebuild(boolean limitWidth) {
                 // if there is no text, there is nothing to do
-                if (_text == null || _text.length() == 0){
-//                      Frame parent = getParent();
-//                      if(parent != null)
-//                              parent.removeItem(this);
+                if (_text == null || _text.length() == 0) {
+                        // Frame parent = getParent();
+                        // if(parent != null)
+                        // parent.removeItem(this);
                         return;
                 }
-                
+
                 AttributedString paragraphText = new AttributedString(_text.toString());
                 paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
@@ -1188 +1190 @@
 
                 updatePolygon();
-                
+
         }
 
@@ -1314 +1316 @@
                         return;
                 }
-                
+
+                // check if its a vector item and paint all the vector stuff too if this
+                // item is a free item
+                // This will allow for dragging vectors around the place!
+                if (hasVector() && isFloating()) {
+                        FrameGraphics.requestRefresh(false);
+                        // TODO make this use a more efficient paint method...
+                        // Have the text item return a bigger repaint area if it has an
+                        // associated vector
+                }
+
                 // the background is only cleared if required
                 if (getBackgroundColor() != null) {
@@ -1418 +1430 @@
                 paintLink(g);
         }
-        
+
         @Override
         protected Rectangle getLinkDrawArea() { // TODO: Revise
@@ -1493 +1505 @@
                         if (isAnnotation())
                                 return;
-                        if (!isLineEnd() && _text.length() > 0 && _text.charAt(0) == DEFAULT_BULLET) {
+                        if (!isLineEnd() && _text.length() > 0
+                                        && _text.charAt(0) == DEFAULT_BULLET) {
                                 newPoint.setLocation(insertText(""
                                                 + (char) KeyEvent.VK_BACK_SPACE, mouseX, mouseY, 1));
@@ -1510 +1523 @@
                                 newPoint.setLocation(insertText(""
                                                 + (char) KeyEvent.VK_BACK_SPACE, mouseX, mouseY, 1));
-                                newPoint
-                                                .setLocation(insertText( DEFAULT_BULLET_STRING, newPoint.x, newPoint.y, 0));
+                                newPoint.setLocation(insertText(DEFAULT_BULLET_STRING,
+                                                newPoint.x, newPoint.y, 0));
                         } else {
                                 newPoint.setLocation(insertText(""
@@ -1557 +1570 @@
                         _lineBreaker.deleteChar(inserting.getIterator(), pos);
                 }
-                
-                
-                
+
         }
 
@@ -1727 +1738 @@
         @Override
         protected int getLinkYOffset() {
-                if (_textLayouts.size() == 0) return  0;
+                if (_textLayouts.size() == 0)
+                        return 0;
                 return Math.round(-(_textLayouts.get(0).getAscent() / 2));
         }
@@ -1748 +1760 @@
 
         public static boolean isBulletChar(char c) {
-                for(int i = 0; i < BULLETS.length; i++){
-                        if(BULLETS[i]== c)
+                for (int i = 0; i < BULLETS.length; i++) {
+                        if (BULLETS[i] == c)
                                 return true;
                 }
-                return c== '*' || c == '+' || c == '>' || c == '-' || c == 'o';
-        }
-        
+                return c == '*' || c == '+' || c == '>' || c == '-' || c == 'o';
+        }
+
         public boolean hasOverlay() {
-                if(!isAnnotation() || getLink()==null)
+                if (!isAnnotation() || getLink() == null)
                         return false;
-                return ItemUtils.startsWithTag(this, "@ao") ||ItemUtils.startsWithTag(this, "@v");
+                return ItemUtils.startsWithTag(this, "@ao")
+                                || ItemUtils.startsWithTag(this, "@v");
         }