Changeset 294

Timestamp:

09/04/08 17:07:39 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (2 diffs)
• actions/Misc.java (modified) (3 diffs)
• agents/Format.java (modified) (1 diff)
• agents/SearchAgent.java (modified) (6 diffs)
• gui/Frame.java (modified) (13 diffs)
• gui/FrameIO.java (modified) (1 diff)
• gui/FrameKeyboardActions.java (modified) (6 diffs)
• items/Item.java (modified) (1 diff)
• items/widgets/DataFrameWidget.java (modified) (2 diffs)
• items/widgets/InteractiveWidget.java (modified) (5 diffs)
• items/widgets/WidgetCorner.java (modified) (7 diffs)
• items/widgets/WidgetEdge.java (modified) (1 diff)
• items/widgets/charts/AbstractPie.java (modified) (1 diff)

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

@@ -334 +334 @@
                 command = command.substring(mname.length()).trim();
                 // If no params are provided get them from a text item on the cursor
-                if (command.length() == 0 && launcher instanceof Text) {
+                if (command.length() == 0 && launcher instanceof Text && launcher.isFloating()) {
                         command = launcher.getText();
                 }
@@ -480 +480 @@
                                 } else if (c.getParameterTypes().length == 0 && con == null) {
                                         con = c;
+                                        params = null;
                                 }
                         }

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

@@ -840 +840 @@
 
                 current.addAllItems(newItems);
-                if(item instanceof Text){
-                        for(Item i: item.getAllConnected()){
-                                if(i instanceof Line){
+                if (item instanceof Text) {
+                        for (Item i : item.getAllConnected()) {
+                                if (i instanceof Line) {
                                         item = i;
                                         break;
@@ -848 +848 @@
                         }
                 }
-                
-                if (!(item instanceof Text)) {
-                        d[0].setThickness(item.getThickness());
-                        d[0].setFillColor(item.getFillColor());
+
+                Color newColor = item.getColor();
+                if (newColor != null) {
                         d[0].setColor(item.getColor());
+                        if (item instanceof Text && item.getBackgroundColor() != null) {
+                                d[0].setFillColor(item.getBackgroundColor());
+                        }else{
+                                d[0].setFillColor(item.getFillColor());
+                        }
+                }
+                float newThickness = item.getThickness();
+                if (newThickness > 0) {
+                        d[0].setThickness(newThickness);
                 }
 
@@ -860 +868 @@
                 return d[0];
         }
-        
+
         public static void StopReminder() {
                 Reminders.stop();

trunk/src/org/expeditee/agents/Format.java

@@ -30 +30 @@
 
         public Format() {
+                super();
         }
 

trunk/src/org/expeditee/agents/SearchAgent.java

@@ -12 +12 @@
 
         private static final String DEFAULT_RESULTS_FRAMESET = "SearchResults";
-        
+
         protected FrameCreator _results;
 
@@ -18 +18 @@
 
         protected String _replacementString;
-        
+
         protected String _startName;
 
@@ -24 +24 @@
                 _pattern = searchText;
         }
-        
+
         @Override
         public boolean initialise(Frame frame, Item item) {
                 String pattern = item.getText();
                 String resultFrameset = null;
-                
-                //TODO use a results frame specified on the profile frame
+
+                // TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
                         resultFrameset = DEFAULT_RESULTS_FRAMESET;
@@ -37 +37 @@
                                         false);
                 }
-                return initialise(frame, item, frame.getFramesetName(), resultFrameset, null, pattern);
+                return initialise(frame, item, frame.getFramesetName(), resultFrameset,
+                                null, pattern);
         }
 
-        public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
-                        String replacementString, String pattern) {
-                _pattern = pattern.toLowerCase();
+        /**
+         * 
+         * @param frame
+         * @param item
+         * @param startName
+         * @param resultsFrameset
+         * @param replacementString
+         * @param pattern
+         *            is ignored if the pattern has already been set earlier.
+         * @return
+         */
+        public boolean initialise(Frame frame, Item item, String startName,
+                        String resultsFrameset, String replacementString, String pattern) {
+                //TODO: Put the init params in the constructor!! Dont want to be setting _pattern in two places!
+                
+                if (_pattern == null)
+                        _pattern = pattern.toLowerCase();
                 _replacementString = replacementString;
                 _startName = startName;
@@ -48 +63 @@
                 // Create a frame to put the results on with the search query
                 // and type as the title
-                String title = this.getClass().getSimpleName() + " [" + startName + "] [" + pattern
-                                + "]";
+                String title = this.getClass().getSimpleName() + " [" + startName
+                                + "] [" + _pattern + "]";
                 _results = new FrameCreator(resultsFrameset, null, title, false, true);
                 // Set the frame to be displayed after running the agent
                 _end = _results.getFirstFrame();
-                
+
                 return super.initialise(frame, item);
         }
-        
+
         public String getResultsFrameName() {
                 return _results.getName();
         }
-        
+
         public static boolean searchItem(Text itemToSearch, String pattern,
                         String replacementString) {
@@ -85 +100 @@
                         // Search for the item and add it to the results page if
                         // it is found
-                        if (searchItem(itemToSearch, pattern,
-                                        replacementString)) {
+                        if (searchItem(itemToSearch, pattern, replacementString)) {
                                 // Add a linked item to the results frame
                                 results.addText(frameName, null, frameName, null, false);

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

@@ -207 +207 @@
 
                 if (_change) {
-                        // Notify the frame listeners that the frame has changed
-                        for (FrameObserver fl : _observers) {
-                                fl.update();
-                        }
+                        notifyObservers();
 
                         setBufferValid(false);
                         _saved = false;
+                }
+        }
+
+        public void notifyObservers() {
+                // Notify the frame listeners that the frame has changed
+                for (FrameObserver fl : _observers) {
+                        fl.update();
                 }
         }
@@ -501 +505 @@
                 for (Overlay o : _overlays.keySet())
                         results.addAll(o.Frame.getItemsWithin(poly));
-                
-                for(Item i: getVectorItems()){
+
+                for (Item i : getVectorItems()) {
                         if (i.intersects(poly)) {
-                                //This assumes a results is a set
+                                // This assumes a results is a set
                                 results.add(i.getEditTarget());
                         }
@@ -703 +707 @@
                         InteractiveWidget iw = ((WidgetCorner) item).getWidgetSource();
                         if (!this._iWidgets.contains(iw)) { // A set would have been
-                                if(FrameMouseActions.isControlDown())
+                                if (FrameMouseActions.isControlDown())
                                         _iWidgets.add(iw);
                                 else
@@ -719 +723 @@
 
         public void refreshSize() {
-                //assert (size != null);
+                // assert (size != null);
                 boolean bReparse = false;
                 for (Item i : getItems()) {
@@ -737 +741 @@
                         }
                 }
-                
-                //Do the anchors on the overlays
-                for(Overlay o: getOverlays()){
+
+                // Do the anchors on the overlays
+                for (Overlay o : getOverlays()) {
                         o.Frame.refreshSize();
                 }
-                
+
                 if (bReparse) {
                         FrameUtils.Parse(this, false);
@@ -1077 +1081 @@
                         int index = toCheck.indexOf(from);
 
-                        //If its the title index will be 0
+                        // If its the title index will be 0
                         if (index < 0)
                                 index = 0;
@@ -1111 +1115 @@
                 int maxY = 0;
                 HighlightMode mode = toAdd.Source.getHighlightMode();
-                if(mode != HighlightMode.None)
+                if (mode != HighlightMode.None)
                         mode = HighlightMode.Connected;
                 Color highlightColor = toAdd.Source.getHighlightColor();
@@ -1123 +1127 @@
                         i.invalidateAll();
                         i.invalidateFill();
-                        //Get the right most x and bottom most y pos
+                        // Get the right most x and bottom most y pos
                         int itemRight = i.getX() + i.getBoundsWidth();
-                        if(itemRight > maxX)
+                        if (itemRight > maxX)
                                 maxX = itemRight;
                         int itemBottom = i.getY() + i.getBoundsHeight();
-                        if(itemBottom > maxY)
+                        if (itemBottom > maxY)
                                 maxY = itemBottom;
                 }
@@ -1309 +1313 @@
                                         ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY,
                                         permission));
-                        //i.setPermission(permission);
+                        // i.setPermission(permission);
                         _overlayItems.add(i);
                 }
@@ -1690 +1694 @@
                 for (Overlay o : getOverlays())
                         o.Frame.refreshItemPermissions(o.permission);
-                
-                //Only update the permissions if we have to
+
+                // Only update the permissions if we have to
                 if (_body.size() > 0 && permission.equals(_body.get(0)._permission))
                         return;
@@ -1698 +1702 @@
                         i.setPermission(permission);
                 }
-                
 
         }
@@ -1932 +1935 @@
                         }
                 }
-                
-                for(Vector v: getVectors()){
+
+                for (Vector v : getVectors()) {
                         toSave.add(v.Source);
                 }
-                
+
                 return toSave;
         }
@@ -2039 +2042 @@
 
         public void parse() {
-                for(Overlay o: getOverlays()){
+                for (Overlay o : getOverlays()) {
                         o.Frame.parse();
                 }
-                //Must parse the frame AFTER the overlays
+                // Must parse the frame AFTER the overlays
                 FrameUtils.Parse(this);
         }

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

@@ -243 +243 @@
 
         public static boolean canAccessFrame(String frameName) {
+                Frame current = DisplayIO.getCurrentFrame();
+                //Just incase the current frame is not yet saved...
+                if(frameName.equals(current.getName())){
+                        FrameIO.SaveFrame(current,false,false);
+                        current.change();
+                        return true;
+                }
+                
                 for (String path : UserSettings.FrameDirs) {
                         if (getFrameFullPathName(path, frameName) != null)

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

@@ -638 +638 @@
                         break;
                 case KeyEvent.VK_TAB:
-                        FrameUtils.getCurrentItem().update();
+                        calculateItem(current);
                         break;
                 case KeyEvent.VK_ESCAPE:
@@ -1057 +1057 @@
                                 break;
                         case SizeDown:
-                                if(isControlDown){
+                                if (isControlDown) {
                                         UserSettings.ScaleFactor -= 0.05;
                                         Misc.repaint();
@@ -1063 +1063 @@
                                 }
                         case SizeUp:
-                                if(isControlDown){
+                                if (isControlDown) {
                                         UserSettings.ScaleFactor += 0.05;
                                         Misc.repaint();
@@ -1078 +1078 @@
                         if (isShiftDown || isControlDown) {
                                 if (on != null) {
-                                        on.update();
+                                        calculateItem(on);
                                 }
                         }
@@ -1132 +1132 @@
         }
 
+        private static void calculateItem(Item toCalculate) {
+                if (!toCalculate.update()) {
+                        toCalculate.setFormula(null);
+                        MessageBay.errorMessage("Can not calculate formula ["
+                                        + toCalculate.getText() + ']');
+                }
+        }
+
         private static void Save() {
                 Frame current = DisplayIO.getCurrentFrame();
                 current.change();
-                FrameIO.SaveFrame(current,true, true);
+                FrameIO.SaveFrame(current, true, true);
         }
 
@@ -2088 +2096 @@
         public static void Refresh() {
                 Frame currentFrame = DisplayIO.getCurrentFrame();
+                
+                //Refresh widgets that use its self as a data source
+                currentFrame.notifyObservers();
+                
                 if (FrameIO.isProfileFrame(currentFrame)) {
                         // TODO ensure that users can not delete the first frame in a

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

@@ -2614 +2614 @@
         }
 
-        public void update() {
-                calculate(getText());
+        public boolean update() {
+                return calculate(getText());
         }
 

trunk/src/org/expeditee/items/widgets/DataFrameWidget.java

@@ -8 +8 @@
 import javax.swing.JComponent;
 
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -96 +97 @@
 
         public void update() {
+                Frame parent = getParentFrame();
+                if(parent != null && parent == DisplayIO.getCurrentFrame()){
+                        refresh();
+                }
+                
                 _needsUpdating = true;
         }

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -1555 +1555 @@
 
                 if (FrameIO.isPositiveInteger(link)) { // relative - convert to
-                                                                                                // absolute
+                        // absolute
 
                         // Get the frameset of this item
@@ -1577 +1577 @@
                 return null;
         }
-        
-        /**
-         * Sets the border color for the widget.
-         * That is, for the source (so it is remembered) and also for all the
-         * corners/edges.
+
+        /**
+         * Sets the border color for the widget. That is, for the source (so it is
+         * remembered) and also for all the corners/edges.
          * 
          * @param c
-         *              The color to set.
+         *            The color to set.
          */
         public void setWidgetEdgeColor(Color c) {
-                for (Item i : _expediteeItems) i.setColor(c);
+                for (Item i : _expediteeItems)
+                        i.setColor(c);
                 // Above indirectly invokes setSourceBorderColor accordingly
         }
-        
+
         /**
          * Sets the thickness of the widget edge.
@@ -1597 +1597 @@
          * 
          * @param thickness
-         *              The new thickness to set.
+         *            The new thickness to set.
          */
         public void setWidgetEdgeThickness(float thickness) {
-                for (Item i : _expediteeItems) i.setThickness(thickness);
-//               Above indirectly invokes setSourceThickness accordingly
-        }
-
-        // TODO: Maybe rename setSource* ..  to update* ... These should actually be friendly!
+                for (Item i : _expediteeItems)
+                        i.setThickness(thickness);
+                // Above indirectly invokes setSourceThickness accordingly
+        }
+
+        // TODO: Maybe rename setSource* .. to update* ... These should actually be
+        // friendly!
         public void setSourceColor(Color c) {
                 _textRepresentation.setColor(c);
@@ -1626 +1628 @@
 
         protected Point getOrigin() {
-                return _d1.getPosition(); // BROOK: This flips around ... the origin can be any point 
+                return _d1.getPosition(); // BROOK: This flips around ... the origin
+                // can be any point
         }
 
@@ -1632 +1635 @@
                 return _d1;
         }
+
+        public void setAnchorBottom(Float anchor) {
+                setPosition(getX(),
+                                Math.round(FrameGraphics.getMaxFrameSize().height - anchor - getHeight()));
+                getSource().setAnchorBottom(anchor);
+        }
+
+        public void setAnchorRight(Float anchor) {
+                setPosition(
+                                Math.round(FrameGraphics.getMaxFrameSize().width - anchor - getWidth()),
+                                getY());
+                getSource().setAnchorRight(anchor);
+        }
 }

trunk/src/org/expeditee/items/widgets/WidgetCorner.java

@@ -6 +6 @@
 import java.util.List;
 
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.items.Dot;
 import org.expeditee.items.ItemParentStateChangedEvent;
@@ -15 +16 @@
         WidgetCorner(int x, int y, int id, InteractiveWidget widgetSource) {
                 super(x, y, id);
-                
+
                 if (widgetSource == null)
                         throw new NullPointerException("widgetSource");
@@ -52 +53 @@
         }
 
-//      @Override
-//      public void translate(Point2D origin, double ratio) {
-//              super.translate(origin, ratio);
-//      }
+        // @Override
+        // public void translate(Point2D origin, double ratio) {
+        // super.translate(origin, ratio);
+        // }
 
         @Override
@@ -142 +143 @@
         public void setSize(float size) {
         }
-        
+
         @Override
         public String getLink() {
@@ -149 +150 @@
 
         @Override
+        public void setAnchorBottom(Float anchor) {
+                _widgetSource.setAnchorBottom(anchor);
+        }
+
+        @Override
+        public void setAnchorRight(Float anchor) {
+                _widgetSource.setAnchorRight(anchor);
+        }
+
+        @Override
+        public Float getAnchorBottom() {
+                return _widgetSource.getSource().getAnchorBottom();
+        }
+
+        @Override
+        public Float getAnchorRight() {
+                return _widgetSource.getSource().getAnchorRight();
+        }
+
+        @Override
         public void setLink(String link) {
                 _widgetSource.setLink(link);
         }
-        
+
+        @Override
+        public void setFormula(String formula) {
+        }
+
         @Override
         public void setData(List<String> data) {
@@ -160 +185 @@
         @Override
         public boolean contains(int x, int y) {
-                return super.contains(x, y) && !_widgetSource.getBounds().contains(x, y);
+                return super.contains(x, y)
+                                && !_widgetSource.getBounds().contains(x, y);
         }
 
@@ -167 +193 @@
                 if (_widgetSource != null) {
                         float minThickness = _widgetSource.getMinimumBorderThickness();
-                        if(newThickness < minThickness)
+                        if (newThickness < minThickness)
                                 newThickness = minThickness;
                         super.setThickness(newThickness, setConnected);

trunk/src/org/expeditee/items/widgets/WidgetEdge.java

@@ -98 +98 @@
         
         @Override
+        public void setFormula(String formula) {
+        }
+        
+        @Override
+        public void setAnchorBottom(Float anchor) {
+                _widgetSource.setAnchorBottom(anchor);
+        }
+
+        @Override
+        public void setAnchorRight(Float anchor) {
+                _widgetSource.setAnchorRight(anchor);
+        }
+        
+        @Override
+        public Float getAnchorBottom() {
+                return _widgetSource.getSource().getAnchorBottom();
+        }
+        
+        @Override
+        public Float getAnchorRight() {
+                return _widgetSource.getSource().getAnchorRight();
+        }
+        
+        @Override
         public boolean contains(int x, int y) {
                 return super.contains(x, y) && !_widgetSource.getBounds().contains(x, y);

trunk/src/org/expeditee/items/widgets/charts/AbstractPie.java

@@ -60 +60 @@
                 for (Text t : dataFrame.getBodyTextItems(false)) {
                         // Ignore line ends for pie charts
-                        if (t.isLineEnd())
+                        //TODO find out HOW text became null when i was doing a graph!!
+                        String text = t.getText();
+                        if (t.isLineEnd() || text == null)
                                 continue;
-                        AttributeValuePair avp = new AttributeValuePair(t.getText());
+                        AttributeValuePair avp = new AttributeValuePair(text);
                         if (avp != null) {
                                 try {