Changeset 282 for trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

Timestamp:

08/27/08 09:18:49 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/items/widgets/InteractiveWidget.java (modified) (14 diffs)

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

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
+import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -133 +134 @@
                 text = text.trim();
 
+                // Check starts with the widget tag and seporator
+                if (!text.startsWith(TAG + ":"))
+                        throw new IllegalArgumentException("Source text must begin with \""
+                                        + TAG + ":\"");
+
+                text = text.substring(TAG.length() + 1).trim();
+
                 int index = 0;
-                if (text.length() > TAG.length() + 1) {
-                        index = text.indexOf(':', TAG.length() + 1); // used for
+                if (text.length() > 0) {
+                        index = text.indexOf(':'); // used for
                         // signifying start
-                        // of
-                }
-
-                // arguments
+                        // of arguments
+                }
+
                 if (index == 0)
                         throw new IllegalArgumentException("Source text must begin with \""
@@ -148 +155 @@
                                 0, index).split(" ");
 
-                // Check starts with the widget tag and seporator
-                if (tokens.length == 0 || !tokens[0].equals(TAG + ":"))
-                        throw new IllegalArgumentException("Source text must begin with \""
-                                        + TAG + ":\"");
-
                 float width = -1, height = -1;
 
-                if (tokens.length < 2)
+                if (tokens.length < 1)
                         throw new IllegalArgumentException(
                                         "Missing widget class name in source text");
@@ -161 +163 @@
                 try {
 
-                        if (tokens.length >= 3) { // parse optional width
-                                width = Integer.parseInt(tokens[2]);
+                        if (tokens.length >= 2) { // parse optional width
+                                width = Integer.parseInt(tokens[1]);
                                 width = (width <= 0) ? width = -1 : width;
                         }
 
-                        if (tokens.length >= 4) { // parse optional height
-                                height = Integer.parseInt(tokens[3]);
+                        if (tokens.length >= 3) { // parse optional height
+                                height = Integer.parseInt(tokens[2]);
                                 height = (height <= 0) ? height = -1 : height;
                         }
@@ -176 +178 @@
                 }
 
-                if (tokens.length > 4)
+                if (tokens.length > 3)
                         throw new IllegalArgumentException(
                                         "to many arguments given before \":\" in source text");
 
-                String classname = tokens[1];
+                String classname = tokens[0];
                 if (classname.charAt(0) == '$')
                         classname = "org.expeditee.items.widgets." + classname.substring(1);
@@ -704 +706 @@
 
         public void setPosition(int x, int y) {
-                if (x == getX() && y == getY()) return;
+                if (x == getX() && y == getY())
+                        return;
 
                 boolean vfloating[] = new boolean[] { _d1.isFloating(),
@@ -925 +928 @@
                                                 .getCurrentMouseEvent())
                         return; // already dealt with this event
-                
+
                 _lastParentStateChangedEvent = e;
-                _lastParentStateChangedMouseEvent = MouseEventRouter.getCurrentMouseEvent();
+                _lastParentStateChangedMouseEvent = MouseEventRouter
+                                .getCurrentMouseEvent();
 
                 switch (e.getEventType()) {
@@ -1072 +1076 @@
         /**
          * 
-         * @return
-         *              The current bounds for this widget. Never null.
+         * @return The current bounds for this widget. Never null.
          */
         public Rectangle getBounds() {
@@ -1155 +1158 @@
                 if (_textRepresentation.getLink() != null
                                 || _textRepresentation.hasAction()) {
-                        //System.out.println("Painted link");
+                        // System.out.println("Painted link");
                         _textRepresentation.paintLinkGraphic(g, getLinkX(), getLinkY());
 
@@ -1493 +1496 @@
 
                 if (newData != null) {
-                        if (data != null) data.add(newData);
+                        if (data != null)
+                                data.add(newData);
                         else {
                                 data = new LinkedList<String>();
                                 data.add(newData);
                                 getCurrentRepresentation().setData(data);
-                                
-                        }
-                } 
+
+                        }
+                }
         }
 
@@ -1507 +1511 @@
          * 
          * @param link
-         *              The new frame link. Can be null (for no link)
-         *              
+         *            The new frame link. Can be null (for no link)
+         * 
          */
         public void setLink(String link) {
@@ -1518 +1522 @@
                         invalidateLink();
         }
-        
-        public void setBackgroundColor(Color c){
+
+        public void setBackgroundColor(Color c) {
                 getSource().setBackgroundColor(c);
         }
-        
-        /**
-         * @return
-         *              The link for this widget. Null if none.
+
+        /**
+         * @return The link for this widget. Null if none.
          */
         public String getLink() {
                 return _textRepresentation.getLink();
         }
-        
-
-        /**
-         * <b>Note:</b> That if the widget has no parent (e.g. the widget is a free-item) then
-         * the absolute link returned will be for the frameset of the current frame.
-         * 
-         * @return
-         *              The absolute link for this item. Null if there is no link, or if
-         *              there is no parent for this widget and the current frame is unavailable.
-         *
+
+        /**
+         * <b>Note:</b> That if the widget has no parent (e.g. the widget is a
+         * free-item) then the absolute link returned will be for the frameset of
+         * the current frame.
+         * 
+         * @return The absolute link for this item. Null if there is no link, or if
+         *         there is no parent for this widget and the current frame is
+         *         unavailable.
+         * 
          */
         public String getAbsoluteLink() {
-                
-                // Note:  cannot return the source absolute link since it does not have
+
+                // Note: cannot return the source absolute link since it does not have
                 // a parent ... thus must manually format link
-                
+
                 String link = getLink();
-                
-                if (link == null || link.length() == 0) return null;
-                
-                if (FrameIO.isPositiveInteger(link)) { // relative - convert to absolute
-                        
+
+                if (link == null || link.length() == 0)
+                        return null;
+
+                if (FrameIO.isPositiveInteger(link)) { // relative - convert to
+                                                                                                // absolute
+
                         // Get the frameset of this item
                         Frame parent = getParentFrame();
-                        if (parent == null) parent = DisplayIO.getCurrentFrame();
-                        if (parent == null) return null;
-                        
+                        if (parent == null)
+                                parent = DisplayIO.getCurrentFrame();
+                        if (parent == null)
+                                return null;
+
                         String framesetName = parent.getFramesetName();
-                        
-                        if (framesetName == null) return null;
-                        
+
+                        if (framesetName == null)
+                                return null;
+
                         return framesetName + link;
-                        
+
                 } else if (FrameIO.isValidFrameName(link)) { // already absolute
                         return link;
                 }
-                
+
                 return null;
         }
@@ -1600 +1608 @@
                 _textRepresentation.setColor(c);
         }
-        
+
         public void setSourceBorderColor(Color c) {
                 _textRepresentation.setBorderColor(c);
         }
-        
+
         public void setSourceFillColor(Color c) {
                 _textRepresentation.setFillColor(c);
         }
-        
+
         public void setSourceThickness(float newThickness, boolean setConnected) {
                 _textRepresentation.setThickness(newThickness, setConnected);
@@ -1616 +1624 @@
                 _textRepresentation.setData(data);
         }
-        
+
         protected Point getOrigin() {
                 return _d1.getPosition(); // BROOK: This flips around ... the origin can be any point 
         }
-        
+
         protected Item getFirstCorner() {
                 return _d1;