Changeset 67 for trunk/src/org/expeditee/io/Conversion.java

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

• trunk/src/org/expeditee/io/Conversion.java (modified) (16 diffs)

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

@@ -10 +10 @@
 import java.util.StringTokenizer;
 
-import org.expeditee.gui.DisplayIO;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -48 +47 @@
                 }
 
+                // check if its a normal rgb code ie. 100 0 40
                 Color rgb = getRGBColor(colorCode, current);
                 if (rgb != null)
@@ -58 +58 @@
                 char c = colorCode.charAt(last);
 
-                while (c >= '0' && c <= '9') {
+                while (Character.isDigit(c)) {
                         num = c + num;
                         if (last <= 0)
@@ -69 +69 @@
                 if (num.length() > 0)
                         amount = Float.parseFloat(num);
+                
+                if(amount > 10) 
+                        amount = 10;
 
                 float color[] = { 0, 0, 0 };
@@ -74 +77 @@
                 if (colorCode.toLowerCase().startsWith("red"))
                         color[0] = amount / 10;
-
-                if (colorCode.toLowerCase().startsWith("green"))
+                else if (colorCode.toLowerCase().startsWith("green"))
                         color[1] = amount / 10;
-
-                if (colorCode.toLowerCase().startsWith("blue"))
+                else if (colorCode.toLowerCase().startsWith("blue"))
                         color[2] = amount / 10;
+                else
+                        return current;
 
                 return new Color(color[0], color[1], color[2]);
@@ -88 +91 @@
 
                 try {
-                        String r = colorCode.substring(0, colorCode.indexOf(" "));
-                        colorCode = colorCode.substring(r.length() + 1);
-
-                        String g = colorCode.substring(0, colorCode.indexOf(" "));
-                        colorCode = colorCode.substring(g.length() + 1);
-
-                        String b = colorCode.substring(0);
+                        String[] values = colorCode.trim().split("\\s+");
+                        
+                        String r = values.length > 0 ? values[0] : "0";
+                        String g = values.length > 1 ? values[1] : "0";
+                        String b = values.length > 2 ? values[2] : "0";
 
                         if (current != null && (r.startsWith("+") || r.startsWith("-"))) {
@@ -125 +126 @@
                         return new Color(color[0], color[1], color[2]);
                 } catch (Exception e) {
-                        return current;
+                        return null;
                 }
         }
@@ -200 +201 @@
                 String code = "t";
                 String fontName = font.getFamily().toLowerCase();
-                
+
                 for (int i = 0; i < Text.FONT_WHEEL.length; i++) {
-                        if (Text.FONT_WHEEL[i].equals(fontName)){
+                        if (Text.FONT_WHEEL[i].equals(fontName)) {
                                 code = "" + Text.FONT_CHARS[i];
                                 break;
                         }
                 }
-                
+
                 switch (font.getStyle()) {
                 case Font.BOLD:
@@ -297 +298 @@
          */
         public static int getFrameNumber(String framename) {
-                String num = framename
-                                .replaceFirst("^\\w+([^\\d]+|\\d+[.][^\\d]+)", "");
+                String num = null;
+                // The framename must end in a digit
+                assert (Character.isDigit(framename.charAt(framename.length() - 1)));
+                // And start with a letter
+                assert (Character.isLetter(framename.charAt(0)));
+                // start at the end and find the first non digit char
+                for (int i = framename.length() - 2; i >= 0; i--) {
+                        if (!Character.isDigit(framename.charAt(i))) {
+                                num = framename.substring(i + 1);
+                                break;
+                        }
+                }
 
                 try {
@@ -309 +320 @@
         /**
          * Returns the frameset poriton of the given Frame name (frame number
-         * removed)
+         * removed) converted to lower case.
          * 
          * @param frame
@@ -319 +330 @@
         }
 
-        public static String getFrameset(String frame, boolean convertToLower) {
-                String set = frame.replaceFirst("(\\d+|[.]\\d+)$", "");
-
-                // if there is no frameset given, then add the current frameset
-                if (set.length() == 0) {
-                        set = DisplayIO.getCurrentFrame().getFramesetName();
+        public static String getFrameset(String framename, boolean convertToLower) {
+                String set = null;
+                assert (Character.isDigit(framename.charAt(framename.length() - 1)));
+                // And start with a letter
+                assert (Character.isLetter(framename.charAt(0)));
+                // start at the end and find the first non digit char
+                for (int i = framename.length() - 2; i >= 0; i--) {
+                        if (!Character.isDigit(framename.charAt(i))) {
+                                set = framename.substring(0, i + 1);
+                                break;
+                        }
                 }
 
@@ -343 +359 @@
          */
         public static int getJustification(String justCode) {
+                assert (justCode != null);
+                justCode = justCode.trim().toLowerCase();
                 // as read from file
                 if (justCode.length() == 1) {
                         switch (justCode.charAt(0)) {
-                        case 'F':
+                        case 'f':
                                 return Item.JUSTIFICATION_FULL;
-                        case 'L':
+                        case 'l':
                                 return Item.JUSTIFICATION_LEFT;
-                        case 'R':
+                        case 'r':
                                 return Item.JUSTIFICATION_RIGHT;
-                        case 'C':
+                        case 'c':
                                 return Item.JUSTIFICATION_CENTER;
                         }
@@ -358 +376 @@
 
                 // from the user
-                justCode = justCode.trim().toLowerCase();
                 if (justCode.equals("center"))
                         return Item.JUSTIFICATION_CENTER;
@@ -395 +412 @@
         public static Object Convert(Class type, String value, Object orig) {
                 // System.out.println("Orig: " + orig);
+                assert (value != null);
+                value = value.trim();
 
                 if (type == String.class
@@ -401 +420 @@
                 else if (type == String.class)
                         return value;
-
-                /*
-                 * if(type == int.class || type == Integer.class){ return
-                 * Integer.parseInt(value); }
-                 * 
-                 * if(type == float.class || type == Float.class){ return
-                 * Float.parseFloat(value); }
-                 */
 
                 if (type == Font.class) {
@@ -510 +521 @@
 
         public static Object[] Convert(Method method, String value, Object current) {
+                value = value.trim();
 
                 String name = method.getName();