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

Timestamp:

07/02/08 12:38:54 (16 years ago)

Author:

ra33

Message:

added functionality for dockable @v's

File:

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

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

@@ -36 +36 @@
  */
 public class Text extends Item {
-
+        public static String LINE_SEPARATOR = System.getProperty("line.separator");
+        public static char[] BULLETS = {'\u2219' , '\u2218', '\u2217'};
+        private static char DEFAULT_BULLET = BULLETS[2];
+        private static String DEFAULT_BULLET_STRING = DEFAULT_BULLET + " ";
+        
         private String[] _processedText = null;
 
@@ -344 +348 @@
          */
         private char getNextBullet(char bullet) {
-                switch (bullet) {
-                case '*':
-                        return '>';
-                case '>':
-                        return '+';
-                case '+':
-                        return 'o';
-                case 'o':
-                        return '*';
-                }
-                return bullet;
+                for(int i = 0; i < BULLETS.length - 1; i++){
+                        if(BULLETS[i]== bullet)
+                                return BULLETS[i+1];
+                }
+                return BULLETS[0];
         }
 
         private char getPreviousBullet(char bullet) {
-                switch (bullet) {
-                case '*':
-                        return 'o';
-                case '>':
-                        return '*';
-                case '+':
-                        return '>';
-                case 'o':
-                        return '+';
-                }
-                return bullet;
+                for(int i = 1; i < BULLETS.length; i++){
+                        if(BULLETS[i]== bullet)
+                                return BULLETS[i - 1];
+                }
+                return BULLETS[BULLETS.length - 1];
         }
 
@@ -1056 +1048 @@
          * Updates the Polygon (rectangle) that surrounds this Text on the screen.
          */
-        protected void updatePolygon() {
+        public void updatePolygon() {
                 // if there is no text, there is nothing to do
                 if (_text == null)
@@ -1303 +1295 @@
                                         (float) _highlightThickness, CAP, JOIN);
                         g.setStroke(_highlightStroke);
-                        if (SelectedMode.Enclosed.equals(getSelectedMode()))
+                        if (HighlightMode.Enclosed.equals(getHighlightMode()))
                                 g.fillPolygon(getPolygon());
                         else
@@ -1459 +1451 @@
                         if (isAnnotation())
                                 return;
-                        if (!isLineEnd() && _text.length() > 0 && _text.charAt(0) == '*') {
+                        if (!isLineEnd() && _text.length() > 0 && _text.charAt(0) == DEFAULT_BULLET) {
                                 newPoint.setLocation(insertText(""
                                                 + (char) KeyEvent.VK_BACK_SPACE, mouseX, mouseY, 1));
@@ -1477 +1469 @@
                                                 + (char) KeyEvent.VK_BACK_SPACE, mouseX, mouseY, 1));
                                 newPoint
-                                                .setLocation(insertText("* ", newPoint.x, newPoint.y, 0));
+                                                .setLocation(insertText( DEFAULT_BULLET_STRING, newPoint.x, newPoint.y, 0));
                         } else {
                                 newPoint.setLocation(insertText(""
@@ -1717 +1709 @@
                 super.setLink(frame);
         }
+
+        public static boolean isBulletChar(char c) {
+                for(int i = 0; i < BULLETS.length; i++){
+                        if(BULLETS[i]== c)
+                                return true;
+                }
+                return c== '*' || c == '+' || c == '>' || c == '-' || c == 'o';
+        }
 }