Changeset 400

Timestamp:

11/18/08 13:34:54 (16 years ago)

Author:

ra33

Message:

Changed the way justification works so that...
Width field has a positive value if explicitly set and under the hood stores a negative value if it has not been set explicitly.

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (2 diffs)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/FrameCreator.java (modified) (1 diff)
• gui/FrameIO.java (modified) (1 diff)
• gui/FrameKeyboardActions.java (modified) (7 diffs)
• gui/FrameUtils.java (modified) (1 diff)
• gui/UserSettings.java (modified) (2 diffs)
• io/Conversion.java (modified) (2 diffs)
• io/DefaultFrameWriter.java (modified) (1 diff)
• io/FrameReader.java (modified) (2 diffs)
• io/KMSReader.java (modified) (1 diff)
• items/Item.java (modified) (4 diffs)
• items/Picture.java (modified) (2 diffs)
• items/Text.java (modified) (17 diffs)
• items/widgets/InteractiveWidget.java (modified) (2 diffs)

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

@@ -141 +141 @@
                         Class[] pString = { String.class };
                         Class[] pInt = { int.class };
+                        Class[] pIntO = { Integer.class };
                         Class[] pFloat = { float.class };
                         Class[] pFloatO = { Float.class };
@@ -267 +268 @@
                         _SetMethods.put("j", Text.class.getMethod("setJustification",
                                         pJustification));
-                        _SetMethods.put("width", Text.class.getMethod("setWidth", pInt));
-                        _SetMethods.put("w", Text.class.getMethod("setWidth", pInt));
+                        _SetMethods.put("width", Text.class.getMethod("setWidth", pIntO));
+                        _SetMethods.put("w", Text.class.getMethod("setWidth", pIntO));
 
                         _SetMethods.put("size", Item.class.getMethod("setSize", pFloat));

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

@@ -23 +23 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemParentStateChangedEvent;
-import org.expeditee.items.Permission;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
@@ -72 +71 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp31Oct2008A";
+        public static String TITLE = "ExpDev";
 
         private DisplayIO() {

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

@@ -195 +195 @@
                         toAdd.setOffset(0, 0);
                         toAdd.setID(_current.getNextItemID());
-                        toAdd.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+                        toAdd.setRightMargin(FrameGraphics.getMaxFrameSize().width, true);
 
                         _current.addItem(toAdd);

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

@@ -680 +680 @@
                 
                 // Assign a width to the title.
-                titleItem.setRightMargin(template.getNameItem().getX());
+                titleItem.setRightMargin(template.getNameItem().getX(), true);
                 
                 return template;

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

@@ -163 +163 @@
                         // DisplayIO.UpdateTitle();
                         text = createText(ch);
-                        justify(text);
+                        text.justify(false);
 
                         FrameUtils.setLastEdited(text);
@@ -193 +193 @@
                  */
                 if (oldY < newMouse.y) {
-                        //float diff = newMouse.y - oldY;
+                        // float diff = newMouse.y - oldY;
                         // System.out.print("c");
                         Rectangle rect = text.getPolygon().getBounds();
-                        
-                        //Text lastEdited = FrameUtils.getLastEdited();
-                        //FrameUtils.setLastEdited(null);
-                        
+
+                        // Text lastEdited = FrameUtils.getLastEdited();
+                        // FrameUtils.setLastEdited(null);
+
                         Item justBelow = FrameUtils.onItem(DisplayIO.getCurrentFrame(),
                                         text.getX() + 10, rect.y + rect.height + 1, false);
-                        
-                        //FrameUtils.setLastEdited(lastEdited);
-                        
-                        //Dont drop unless 
-                        if (justBelow != null && justBelow instanceof Text && justBelow != on) {
+
+                        // FrameUtils.setLastEdited(lastEdited);
+
+                        // Dont drop unless
+                        if (justBelow != null && justBelow instanceof Text
+                                        && justBelow != on) {
                                 // Drop all the items below it down!
                                 // Get the list of items that must be dropped
@@ -237 +238 @@
                                 // DisplayIO.getCurrentFrame().removeItem(text);
                                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-                        }
-                }
-        }
-
-        /**
-         * @param text
-         */
-        private static void justify(Text text) {
-                // Check if that text item is inside an enclosing rectangle...
-                // Set its max width accordingly
-                Polygon enclosure = FrameUtils.getEnlosingPolygon();
-                if (enclosure != null) {
-                        Rectangle bounds = enclosure.getBounds();
-                        text.setRightMargin(bounds.x + bounds.width);
-                } else {
-                        text.setRightMargin(FrameGraphics.getMaxFrameSize().width);
-
-                        // Check for the annotation that restricts the width of text items
-                        // on the frame
-                        String widthString;
-                        if ((widthString = text.getParentOrCurrentFrame()
-                                        .getAnnotationValue("maxwidth")) != null) {
-                                try {
-                                        int width = text.getWidth();
-                                        int maxWidth = Integer.parseInt(widthString);
-                                        if (maxWidth < width)
-                                                text.setWidth(maxWidth);
-                                } catch (NumberFormatException nfe) {
-                                }
                         }
                 }
@@ -630 +602 @@
                         }
                         textItem.setX(FrameMouseActions.getX());
-                        justify(textItem);
+                        textItem.justify(false);
                         DisplayIO.getCurrentFrame().addItem(textItem);
                         return textItem;
@@ -969 +941 @@
                         if (text == null) {
                                 for (Text t : currentFrame.getBodyTextItems(false)) {
-                                        justify(t);
+                                        t.justify(true);
                                 }
 
@@ -978 +950 @@
                         // text.setWidth(text.getBoundsWidth() - Item.MARGIN_RIGHT
                         // - UserSettings.Gravity);
-                        justify(text);
+                        text.justify(true);
                         break;
                 case KeyEvent.VK_S:
@@ -1435 +1407 @@
                                         || FreeItems.itemsAttachedToCursor()) {
                                 dummyItem.getParentOrCurrentFrame().removeItem(dummyItem);
-                                dummyItem.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+                                dummyItem.setRightMargin(FrameGraphics.getMaxFrameSize().width,
+                                                false);
                         } else {
                                 dummyItem.setWidth(toDropFrom.getWidth());

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

@@ -1091 +1091 @@
                                 MessageBay.warningMessage("Exception occured when loading "
                                                 + i.getClass().getSimpleName() + "(ID: " + i.getID()
-                                                + ") " + e.getMessage());
+                                                + ") " + e.getMessage() != null ? e.getMessage() : "");
                         }
                 }

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

@@ -72 +72 @@
         static {
                 String jarPath = getJarLocation();
-                if (jarPath != null)
+                if (jarPath != null){
                         FrameIO.changeParentFolder(jarPath);
+                }
                 else
                         FrameIO.changeParentFolder("." + File.separator + "expeditee"
@@ -117 +118 @@
 
                         int lastFileSeparator = jarName.lastIndexOf(File.separator);
+                        
+                        DisplayIO.TITLE = jarName.substring(lastFileSeparator + 1, jarName.length() - 4);
+                        
                         return jarName.substring(0, lastFileSeparator + 1);
                 }

trunk/src/org/expeditee/io/Conversion.java

@@ -400 +400 @@
                         return Float.parseFloat(value);
                 }
+                
+                if (type.equals(Integer.class)) {
+                        if (orig instanceof Integer
+                                        && (value.startsWith("+") || value.startsWith("-"))) {
+                                value = value.replace("+", "");
+
+                                return ((Integer) orig) + Integer.parseInt(value);
+                        }
+
+                        if (value.length() == 0 || value.equals("null"))
+                                return null;
+
+                        return Integer.parseInt(value);
+                }
 
                 if (type.equals(double.class)) {
@@ -583 +597 @@
 
                 // integers can also be returned immediately
-                if (output instanceof Integer && (Integer) output >= 0)
+                if (output instanceof Integer)
                         return "" + output;
 

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -113 +113 @@
                         _ItemTags
                                         .put("m", Text.class.getMethod("getInitialSpacing", param));
-                        _ItemTags.put("w", Text.class.getMethod("getWidth", param));
+                        _ItemTags.put("w", Text.class.getMethod("getWidthToSave", param));
                         _ItemTags.put("k", Text.class.getMethod("getJustification", param));
 

trunk/src/org/expeditee/io/FrameReader.java

@@ -28 +28 @@
         protected static Class[] pString = { String.class };
         protected static Class[] pInt = { int.class };
+        protected static Class[] pIntO = { Integer.class };
         protected static Class[] pFloat = { float.class };
         protected static Class[] pFloatO = { Float.class };
@@ -115 +116 @@
                         _ItemTags.put('b', Text.class.getMethod("setLetterSpacing", pInt));
                         _ItemTags.put('m', Text.class.getMethod("setInitialSpacing", pInt));
-                        _ItemTags.put('w', Text.class.getMethod("setWidth", pInt));
+                        _ItemTags.put('w', Text.class.getMethod("setWidth", pIntO));
                         _ItemTags.put('k', Text.class.getMethod("setJustification", pJustification));
 

trunk/src/org/expeditee/io/KMSReader.java

@@ -106 +106 @@
                         _ItemTags.put("b", Text.class.getMethod("setLetterSpacing", pInt));
                         _ItemTags.put("m", Text.class.getMethod("setInitialSpacing", pInt));
-                        _ItemTags.put("w", Text.class.getMethod("setWidth", pInt));
+                        _ItemTags.put("w", Text.class.getMethod("setWidth", pIntO));
                         _ItemTags.put("k", Text.class.getMethod("setJustification", pJustification));
 

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

@@ -191 +191 @@
                  * the user uses backspace to delete a text line end
                  */
-                dest._anchorBottom = source._anchorBottom;
-                dest._anchorRight = source._anchorRight;
+                //dest._anchorBottom = source._anchorBottom;
+                //dest._anchorRight = source._anchorRight;
 
                 dest.setFormula(source.getFormula());
@@ -946 +946 @@
         }
 
-        public int getWidth() {
-                return 0;
+        public Integer getWidthToSave() {
+                return getWidth();
+        }
+        
+        public Integer getWidth() {
+                return null;
         }
 
@@ -1862 +1866 @@
         }
 
-        public void setWidth(int width) throws UnsupportedOperationException {
+        public void setWidth(Integer width) throws UnsupportedOperationException {
                 throw new UnsupportedOperationException(
                                 "Item type does not support width attribute!");
         }
 
-        public void setRightMargin(int i) {
-                setWidth(i - getX() - Item.MARGIN_LEFT);
+        public void setRightMargin(int i, boolean fixWidth) {
+                int newWidth = i - getX() - Item.MARGIN_LEFT;
+                if(!fixWidth){
+                        newWidth *= -1;
+                }
+                
+                setWidth(newWidth);
         }
 
@@ -2809 +2818 @@
                 return _locks.contains(item);
         }*/
+        
+        
 }

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

@@ -273 +273 @@
 
         @Override
-        public void setWidth(int width) {
+        public void setWidth(Integer width) {
                 _scale = width * 1F / (_end.x - _start.x);
         }
@@ -289 +289 @@
          */
         @Override
-        public int getWidth() {
+        public Integer getWidth() {
                 return Math.round((_end.x - _start.x) * _scale);
         }

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

@@ -47 +47 @@
  */
 public class Text extends Item {
+        private static final int ADJUST_WIDTH_THRESHOLD = 200;
+
         public static String LINE_SEPARATOR = System.getProperty("line.separator");
 
@@ -98 +100 @@
         public static final int PAGE_UP = 8;
 
-        private int _maxWidth = -1;
+        private Integer _maxWidth = null;
 
         private Justification _justification = Justification.left;
@@ -181 +183 @@
          */
         @Override
-        public void setWidth(int width) {
-                invalidateAll();
-                // 0 is the default
-                if (width <= 0) {
-                        width = -1;
+        public void setWidth(Integer width) {
+                invalidateAll();
+
+                if (width == null) {
                         setJustification(Justification.left);
+                        setRightMargin(FrameGraphics.getMaxFrameSize().width, false);
+                        return;
                 }
 
@@ -194 +197 @@
         }
 
+        public Integer getWidthToSave() {
+                return _maxWidth;
+        }
+        
         /**
          * Returns the maximum width of this Text item when justifcation is used.
-         * Note the returned value may be -1, which indicates that there is no
-         * maximum size set
+         * If the width is negative, it means no explicit width has been set
          * 
          * @return The maximum width of this Text item when justification is used
          */
         @Override
-        public int getWidth() {
+        public Integer getWidth() {
+                if (_maxWidth == null || _maxWidth <= 0)
+                        return null;
                 return _maxWidth;
+        }
+
+        public Integer getAbsoluteWidth() {
+                if (_maxWidth == null) {
+                        return Integer.MAX_VALUE;
+                }
+
+                return Math.abs(_maxWidth);
         }
 
@@ -224 +240 @@
 
                 // Only justification left works with 0 width
-                if (just != Justification.left && getWidth() <= 0) {
-                        // TODO Tighten this up so it subtracts the margin widths
-                        setWidth(getBoundsWidth());
-                }
+                // if (just != null && just != Justification.left && !hasWidth()) {
+                // // TODO Tighten this up so it subtracts the margin widths
+                // setWidth(getBoundsWidth());
+                // }
 
                 _justification = just;
@@ -247 +263 @@
 
         private int getJustOffset(TextLayout layout) {
-                if (getWidth() < 0)
-                        return 0;
-
                 if (getJustification() == Justification.center)
-                        return (int) ((getWidth() - layout.getAdvance()) / 2);
+                        return (int) ((getAbsoluteWidth() - layout.getAdvance()) / 2);
                 else if (getJustification() == Justification.right)
-                        return (int) (getWidth() - layout.getAdvance());
+                        return (int) (getAbsoluteWidth() - layout.getAdvance());
 
                 return 0;
@@ -269 +282 @@
                 setText(text, false);
         }
-        
+
         public void setText(String text, Boolean clearCache) {
                 // if (_text != null && text.length() < _text.length())
@@ -279 +292 @@
                  * mode
                  */
-                if(clearCache){
+                if (clearCache) {
                         clearCache();
-                }               
-                        
+                }
+
                 rebuild(true);
                 invalidateAll();
@@ -1314 +1327 @@
                 // If its justification right or center then DONT limit the width
                 if (getJustification() != null) {
-                        maxX = Item.MARGIN_RIGHT + getWidth();
+                        maxX = Item.MARGIN_RIGHT + getAbsoluteWidth();
                 }
 
@@ -1368 +1381 @@
 
                 if (limitWidth) {
-                        if (getWidth() > 0)
-                                width = getWidth();
+                        width = getAbsoluteWidth();
                         // else if (getMaxWidth() > 0)
                         // width = Math.max(50, getMaxWidth() - getX()
@@ -1400 +1412 @@
                         _lineOffsets.add(_lineBreaker.getPosition());
 
-                        if (getWidth() > 0 && getJustification() == Justification.full
+                        if (/* hasWidth() && */getJustification() == Justification.full
                                         && _lineBreaker.getPosition() < _text.length())
                                 layout = layout.getJustifiedLayout(width);
@@ -1409 +1421 @@
                 updatePolygon();
 
+        }
+
+        private boolean hasFixedWidth() {
+                assert (_maxWidth != null);
+                if(_maxWidth == null){
+                        justify(false);
+                }
+                return _maxWidth > 0;
         }
 
@@ -1658 +1678 @@
                 copy.setSpacing(getSpacing());
                 copy.setInitialSpacing(getInitialSpacing());
+
+                copy.setWidth(getWidth());
                 copy.setJustification(getJustification());
                 copy.setLetterSpacing(getLetterSpacing());
@@ -1669 +1691 @@
                 }
                 copy.setHidden(!isVisible());
-                // copy.setWidth(getWidth());
                 return copy;
         }
@@ -1856 +1877 @@
                 setPosition(MARGIN_LEFT, MARGIN_LEFT + getBoundsHeight());
                 Frame modelFrame = getParentOrCurrentFrame();
-                if (modelFrame != null) { 
-                        setRightMargin(modelFrame.getNameItem().getX()
-                                        - MARGIN_LEFT);
+                if (modelFrame != null) {
+                        setRightMargin(modelFrame.getNameItem().getX() - MARGIN_LEFT, true);
                 } else {
-                        System.out.print("Error: text.resetTitlePosition, getParent or currentFrame returned null");
-                        setRightMargin(MARGIN_LEFT);
+                        System.out
+                                        .print("Error: text.resetTitlePosition, getParent or currentFrame returned null");
+                        setRightMargin(MARGIN_LEFT, true);
                 }
         }
@@ -1943 +1964 @@
                 if (isLineEnd())
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+
+                if (!hasFixedWidth()) {
+                        int frameWidth = FrameGraphics.getMaxFrameSize().width;
+                        /*
+                         * Only change width if it is more than 150 pixels from the right of
+                         * the screen
+                         */
+                        if (frameWidth - getX() > ADJUST_WIDTH_THRESHOLD) {
+                                justify(false);
+                                //setRightMargin(frameWidth, false);
+                        }
+                }
+        }
+        
+        public void justify(boolean fixWidth) {
+                Integer width = FrameGraphics.getMaxFrameSize().width;
+
+                // Check if that text item is inside an enclosing rectangle...
+                // Set its max width accordingly
+                Polygon enclosure = FrameUtils.getEnlosingPolygon();
+                if (enclosure != null) {
+                        Rectangle bounds = enclosure.getBounds();
+                        if(bounds.width > 200 && getX() < bounds.width / 3 + bounds.x){
+                                width = bounds.x + bounds.width;
+                        }
+                }
+
+                if (getWidth() == null)
+                        setRightMargin(width, fixWidth);
+
+                // Check for the annotation that restricts the width of text items
+                // on the frame
+                String widthString;
+                if ((widthString = getParentOrCurrentFrame().getAnnotationValue(
+                                "maxwidth")) != null) {
+                        try {
+                                int oldWidth = getWidth();
+                                int maxWidth = Integer.parseInt(widthString);
+                                if (maxWidth < oldWidth)
+                                        setWidth(maxWidth);
+                        } catch (NumberFormatException nfe) {
+                        }
+
+                }
         }
 
@@ -2210 +2275 @@
         public void scale(Float scale, int originX, int originY) {
                 setSize(getSize() * scale);
+
                 setWidth(Math.round(getWidth() * scale));
                 super.scale(scale, originX, originY);

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

@@ -183 +183 @@
 
                 String classname = tokens[0];
-                if (classname.charAt(0) == '$')
-                        classname = Actions.getClassName(classname.substring(1));
+                if (classname.charAt(0) == '$'){
+                        String shortClassname = classname.substring(1);
+                        classname = Actions.getClassName(shortClassname);
+                        
+                        if (classname == null) // ensure it exists
+                                throw new InteractiveWidgetNotAvailableException(shortClassname
+                                                + " does not exist or is not an InteractiveWidget");
+                }
                 // Attempt to locate the class using reflection
                 Class<?> iwclass = findIWidgetClass(classname);
@@ -234 +240 @@
          */
         private static Class findIWidgetClass(String classname) {
+                if(classname == null)
+                        return null;
+                
                 try {
                         Class c = Class.forName(classname); // attempt to find the class