Changeset 410 for trunk/src/org/expeditee/items/Text.java

Timestamp:

11/19/08 16:43:35 (16 years ago)

Author:

ra33

Message:

Completed several tasks specified by Rob...

1. Changing the resize for single text items to use the text items origin as the origin for the resize.

2. Added message linking to documentation for SIMPLE statements when a statement is used incorrectly.

3. Other minor changes...

File:

• trunk/src/org/expeditee/items/Text.java (modified) (7 diffs)

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

@@ -100 +100 @@
         public static final int PAGE_UP = 8;
 
-        private Integer _maxWidth = null;
+        /*
+         * Set the width to be IMPLICIT, but as wide as possible, a negative width
+         * value is one that is implicitly set by the system... a positive value is
+         * one explicitly set by the user.
+         */
+        private Integer _maxWidth = Integer.MIN_VALUE + 1;
 
         private Justification _justification = Justification.left;
@@ -575 +580 @@
                 _text.insert(left, newText);
                 rebuild(true);
+                
+                clearCache();
 
                 invalidateAll();
@@ -1126 +1133 @@
                         List<String> list = new LinkedList<String>();
 
+                        // Rebuilding prevents errors when displaying frame bitmaps
+                        if (_lineOffsets.size() == 0) {
+                                rebuild(false);
+                        }
+
                         int last = 0;
                         for (int offset : _lineOffsets) {
@@ -1534 +1546 @@
                 if (_textLayouts.size() < 1) {
                         rebuild(true);
-                        //System.out.println("Error: " + _text);
-                        //return;
+                        // System.out.println("Error: " + _text);
+                        // return;
                 }
 
@@ -1684 +1696 @@
                 copy.setInitialSpacing(getInitialSpacing());
 
-                copy.setWidth(getWidth());
+                copy.setWidth(getWidthToSave());
                 copy.setJustification(getJustification());
                 copy.setLetterSpacing(getLetterSpacing());
                 copy.setWordSpacing(getWordSpacing());
-                copy.setWidth(getWidth());
+                copy.setWidth(getWidthToSave());
                 copy.setFont(getFont());
                 if (hasFormula()) {
@@ -1980 +1992 @@
                                 // setRightMargin(frameWidth, false);
                         }
+                }
+                String text = _text.toString();
+
+                // Show the overlay stuff immediately if this is an overlay item
+                if (hasLink() && (text.startsWith("@ao") || text.startsWith("@o"))) {
+                        FrameKeyboardActions.Refresh();
                 }
         }
@@ -2285 +2303 @@
                 rebuild(true);
         }
+
+        /*
+         * Returns the SIMPLE statement contained by this text item.
+         * 
+         */
+        public String getStatement() {
+                return getText().split("\\s+")[0];
+        }
 }