Changeset 116

Timestamp:

07/02/08 17:26:51 (16 years ago)

Author:

ra33

Message:

Added SearchItem and SearchStr

Location:

trunk/src/org/expeditee

Files:

• actions/Simple.java (modified) (6 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (4 diffs)
• gui/FrameMouseActions.java (modified) (10 diffs)
• gui/FrameUtils.java (modified) (2 diffs)
• items/Item.java (modified) (17 diffs)
• items/Text.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Simple.java

@@ -323 +323 @@
                         // an item without a link signals to run the current frame
                         if (current.getLink() == null) {
-                                //Make a copy but hide it
+                                // Make a copy but hide it
                                 current = current.copy();
                                 current.setLink(DisplayIO.getCurrentFrame().getName());
@@ -352 +352 @@
          */
         public static void DebugFrame(Text current, float pause, Color color) {
-                if(isProgramRunning()){
+                if (isProgramRunning()) {
                         stop();
                 }
@@ -412 +412 @@
                         context.getPointers().setObject(SPointer.framePrefix + varName,
                                         frame);
+                        context.getPointers().setObject(SPointer.itemPrefix + varName,
+                                        frame.getTitleItem());
                         context.getPrimitives().add(SString.prefix + varName,
                                         new SString(frame.getName()));
@@ -481 +483 @@
                 if (_step) {
                         DisplayIO.removeFromBack();
-                        if(DisplayIO.getCurrentFrame() != current.getParent())
+                        if (DisplayIO.getCurrentFrame() != current.getParent())
                                 DisplayIO.setCurrentFrame(current.getParent());
                 }
@@ -766 +768 @@
                         // Check if the user wants to display a message
                         // Check for set statements
+                } else if (tokens[0].startsWith("search")) {
+                        if (tokens[0].equals("searchstr")) {
+                                assertExactParametreCount(tokens, 5);
+                                String searchStr = context.getPrimitives().getStringValue(
+                                                tokens[1]);
+                                String pattern = context.getPrimitives().getStringValue(
+                                                tokens[2]);
+                                String[] result = searchStr.split(pattern, 2);
+                                boolean bFound = result.length > 1;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(bFound));
+                                if (bFound) {
+                                        context.getPrimitives().setValue(tokens[4],
+                                                        new SInteger(result[0].length() + 1));
+                                        context.getPrimitives().setValue(tokens[5],
+                                                        new SInteger(searchStr.length() - result[1].length()));
+                                }
+                        }else if (tokens[0].equals("searchitem")) {
+                                assertExactParametreCount(tokens, 5);
+                                assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                                Text searchItem = (Text)context.getPointers().getVariable(tokens[1]).getValue();
+                                String searchStr = searchItem.getText();
+                                String pattern = context.getPrimitives().getStringValue(
+                                                tokens[2]);
+                                String[] result = searchStr.split(pattern, 2);
+                                boolean bFound = result.length > 1;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(bFound));
+                                if (bFound) {
+//                                      context.getPrimitives().setValue(tokens[4],
+//                                                      new SInteger(1));
+                                        context.getPrimitives().setValue(tokens[4],
+                                                        new SInteger(result[0].length() + 1));
+//                                      context.getPrimitives().setValue(tokens[6],
+//                                                      new SInteger(1));
+                                        context.getPrimitives().setValue(tokens[5],
+                                                        new SInteger(searchStr.length() - result[1].length()));
+                                }
+                        }
                 } else if (tokens[0].startsWith("set")) {
                         if (tokens[0].equals("set")) {
@@ -794 +835 @@
                                 assertExactParametreCount(tokens, 3);
 
-                                Map<String,String> map = (Map<String,String>) context.getPointers().getVariable(tokens[1])
-                                                .getValue();
+                                Map<String, String> map = (Map<String, String>) context
+                                                .getPointers().getVariable(tokens[1]).getValue();
                                 String attribute = context.getPrimitives().getStringValue(
                                                 tokens[2]);

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

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

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

@@ -750 +750 @@
         public void undo() {
                 Item undo = null;
+                boolean bReparse = false;
 
                 if (_undo.size() <= 0)
@@ -755 +756 @@
 
                 undo = _undo.pop();
-
+                
                 // if the change was to characteristics
                 if (undo.isVisible() && _body.contains(undo)) {
@@ -786 +787 @@
 
                         for (Item i : toRestore) {
+                                bReparse |= i.hasOverlay();
                                 if (i instanceof Line) {
                                         Line line = (Line) i;
@@ -798 +800 @@
                 change();
                 FrameMouseActions.getInstance().refreshHighlights();
+                if(bReparse)
+                        FrameUtils.Parse(this, false);
                 FrameGraphics.Repaint();
                 ItemUtils.EnclosedCheck(_body);

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

@@ -2073 +2073 @@
                         updateCursor();
                         ItemUtils.EnclosedCheck(current.getItems());
+                        if (toDelete.hasOverlay())
+                                FrameUtils.Parse(current, false);
                         FrameGraphics.Repaint();
                 }
@@ -2080 +2082 @@
 
         private static void deleteItems(Collection<Item> itemList) {
+                boolean bReparse = false;
                 SessionStats.DeletedItems(itemList);
                 List<Frame> modifiedFrames = new LinkedList<Frame>();
@@ -2088 +2091 @@
                                 modifiedFrames.add(parent);
                         i.setHighlightMode(HighlightMode.None);
+                        bReparse |= i.hasOverlay();
                 }
                 // If they are all free items then add the current frame
@@ -2119 +2123 @@
                 // TODO: How should undelete deal with undo when items are removed from
                 // the current frame as well as the overlay frame
-                DisplayIO.getCurrentFrame().addAllToUndo(itemList);
+                Frame currentFrame = DisplayIO.getCurrentFrame();
+                currentFrame.addAllToUndo(itemList);
                 itemList.clear();
+                if (bReparse)
+                        FrameUtils.Parse(currentFrame, false);
+
         }
 
@@ -2374 +2382 @@
 
         public static void pickup(Collection<Item> toGrab) {
-
+                boolean bReparse = false;
                 String currentFrame = DisplayIO.getCurrentFrame().getName();
                 Iterator<Item> iter = toGrab.iterator();
@@ -2396 +2404 @@
                         Frame.FreeItems.add(i);
                         i.setFloating(true);
+                        if (i.hasVector()) {
+                                bReparse = true;
+                                // Frame overlayFrame = FrameIO.LoadFrame(i.getAbsoluteLink());
+                                // Collection<Item> copies = ItemUtils.CopyItems(overlayFrame
+                                // .getNonAnnotationItems(), i.getVector());
+                                // Frame.FreeItems.addAll(copies);
+                                // TODO add the copies to the free items so they are visible
+                                // when the cursor is moving around but are not anchored
+                        }
                 }
                 _lastHighlightedItem = null;
@@ -2434 +2451 @@
                                         .DisplayMessage("Insufficient permission pickup the items");
                 }
+                if (bReparse)
+                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false);
+
                 FrameGraphics.Repaint();
         }
@@ -2487 +2507 @@
 
         public static void anchor(Collection<Item> toAnchor) {
+                boolean bReparse = false;
                 // Need to make sure we check enclosure for overlays etc
                 Set<Frame> checkEnclosure = new HashSet<Frame>();
@@ -2492 +2513 @@
                         anchor(i, false);
                         checkEnclosure.add(i.getParentOrCurrentFrame());
+                        bReparse |= i.hasOverlay();
                 }
                 toAnchor.clear();
@@ -2498 +2520 @@
                         ItemUtils.EnclosedCheck(f.getItems());
                 }
+                if (bReparse)
+                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false);
                 FrameGraphics.Repaint();
         }

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

@@ -889 +889 @@
                                                         } catch (Exception e) {
                                                         }
-                                                        vectors.add(new Vector(vector, vectorPermission, i
+                                                        Vector newVector = new Vector(vector, vectorPermission, i
                                                                         .getPosition(), scale, i.getColor(), i
-                                                                        .getBackgroundColor()));
+                                                                        .getBackgroundColor());
+                                                        i.setOverlay(newVector);
+                                                        vectors.add(newVector);
                                                 }
                                         }
@@ -946 +948 @@
                                                         // If it wasnt in the list create it and add it.
                                                         if (!found) {
-                                                                overlays.add(new Overlay(overlay,
-                                                                                permissionLevel));
+                                                                Overlay newOverlay = new Overlay(overlay,
+                                                                                permissionLevel);
+                                                                i.setOverlay(newOverlay);
+                                                                overlays.add(newOverlay);
                                                         }
                                                 }

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

@@ -29 +29 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.Overlay;
+import org.expeditee.gui.Vector;
 import org.expeditee.io.Conversion;
 import org.expeditee.io.Logger;
@@ -114 +116 @@
                         new Color(150, 150, 255), new Color(150, 255, 150),
                         new Color(255, 150, 255), new Color(255, 255, 100), Color.WHITE,
-                         Color.BLACK};
-                                                                                                                                 /* Color.GRAY,
-                                                                                                                                 * Color.DARK_GRAY,
-                                                                                                                                 */
+                        Color.BLACK };
+
+        /*
+         * Color.GRAY, Color.DARK_GRAY,
+         */
 
         public static final int UNCHANGED_CURSOR = -100;
@@ -236 +239 @@
 
         public Permission _permission = Permission.full;
-        
-        public void setPermission(Permission permission){
+
+        public void setPermission(Permission permission) {
                 _permission = permission;
         }
-        
-        public boolean hasPermission(Permission permission){
+
+        public boolean hasPermission(Permission permission) {
                 return _permission.ordinal() >= permission.ordinal();
         }
@@ -315 +318 @@
                 }
 
-                if (_actions == null){
+                if (_actions == null) {
                         _poly = null;
                         _actions = new LinkedList<String>();
@@ -931 +934 @@
                 Color fillColor = getFillColor();
                 if (fillColor != null && getEnclosingDots() != null) {
-                        if(isFloating()){
-                                //TODO experiment with adding alpha when picking up filled items...
-                                //Slows things down quite alot!!
-                                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(), fillColor.getBlue());
-                        }                       
+                        if (isFloating()) {
+                                // TODO experiment with adding alpha when picking up filled
+                                // items...
+                                // Slows things down quite alot!!
+                                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
+                                                fillColor.getBlue());
+                        }
                         g.setColor(fillColor);
                         // The painting is not efficient enough for gradients...
@@ -1039 +1044 @@
                 // Check if all the characters are digits and hence it is a relative
                 // link
-                if(!FrameIO.isPositiveInteger(link))
+                if (!FrameIO.isPositiveInteger(link))
                         return;
 
@@ -1054 +1059 @@
 
         /**
-         * Sets any action code that should be associated with
-         * this Item Each entry in the list is one line of code
+         * Sets any action code that should be associated with this Item Each entry
+         * in the list is one line of code
          * 
          * @param actions
@@ -1061 +1066 @@
          */
         public void setActions(List<String> actions) {
-                //Want to resize the highlight box for text items if actions have been added
+                // Want to resize the highlight box for text items if actions have been
+                // added
                 _poly = null;
                 if (actions == null || actions.size() == 0)
@@ -1420 +1426 @@
                         return;
                 assert (_parent != null);
-                
-                if(FrameIO.isPositiveInteger(link))
+
+                if (FrameIO.isPositiveInteger(link))
                         return;
-                
+
                 // Check if the link is for the current frameset
                 if (_parent.getFramesetName().equalsIgnoreCase(
@@ -1440 +1446 @@
         /**
          * Sets the thickness of the item.
+         * 
          * @param thick
          */
-        public void setThickness(float thick){
+        public void setThickness(float thick) {
                 setThickness(thick, true);
         }
-        
+
         /**
          * Sets the thickness of this item.
-         * @param thick the new thickness for the item
-         * @param setConnectedThickness true if all items connected to this item should also have their thickness set
+         * 
+         * @param thick
+         *            the new thickness for the item
+         * @param setConnectedThickness
+         *            true if all items connected to this item should also have
+         *            their thickness set
          */
         public void setThickness(float thick, boolean setConnectedThickness) {
@@ -1555 +1566 @@
                 this._visible = !state;
         }
-        
 
         public void setVisible(boolean state) {
@@ -1700 +1710 @@
                 return _lines.size() > 0;
         }
-        
-        public boolean hasEnclosures(){
+
+        public boolean hasEnclosures() {
                 return _enclosures.size() > 0;
         }
@@ -1759 +1769 @@
 
         public void setAction(String string) {
-                //Want to resize the highlight box for text items if actions are been added
-                if(_actions == null || _actions.size() == 0){
+                // Want to resize the highlight box for text items if actions are been
+                // added
+                if (_actions == null || _actions.size() == 0) {
                         _poly = null;
                 }
@@ -1857 +1868 @@
                         // if parent is null it is an item on the message box
                         // so it must already be absolute
-                        //assert (!FrameIO.isPositiveInteger(link));
-                        //return link;
-                        
+                        // assert (!FrameIO.isPositiveInteger(link));
+                        // return link;
+
                 }
 
@@ -1961 +1972 @@
          * @param ratio
          */
-        public void translate(Point2D origin, double ratio) {           
+        public void translate(Point2D origin, double ratio) {
                 _x = (float) (origin.getX() + ratio * (_x - origin.getX()));
                 _y = (float) (origin.getY() + ratio * (_y - origin.getY()));
@@ -2003 +2014 @@
         private boolean _deleted = false;
 
+        private Overlay _overlay = null;
+
         /**
          * For now there can only be one enclosure per item
+         * 
          * @param enclosure
          */
@@ -2024 +2038 @@
                 return _deleted;
         }
+
+        public boolean hasVector() {
+                return _overlay instanceof Vector;
+        }
+        
+        public boolean hasOverlay() {
+                return _overlay != null;
+        }
+
+        public Vector getVector() {
+                if (_overlay instanceof Vector)
+                        return (Vector) _overlay;
+                return null;
+        }
+
+        public void setOverlay(Overlay overlay) {
+                _overlay = overlay;
+        }
 }

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

@@ -1717 +1717 @@
                 return c== '*' || c == '+' || c == '>' || c == '-' || c == 'o';
         }
+        
+        public boolean hasOverlay() {
+                if(!isAnnotation() || getLink()==null)
+                        return false;
+                return ItemUtils.startsWithTag(this, "@ao") ||ItemUtils.startsWithTag(this, "@v");
+        }
 }