Changeset 95 for trunk

Timestamp:

06/06/08 16:42:37 (16 years ago)

Author:

ra33

Message:

Added a couple of tests for AttributeUtils class

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• src/org/expeditee/agents/ComputeTree.java (modified) (1 diff)
• src/org/expeditee/gui/AttributeUtils.java (modified) (3 diffs)
• src/org/expeditee/gui/Frame.java (modified) (1 diff)
• src/org/expeditee/gui/FrameIO.java (modified) (2 diffs)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (8 diffs)
• src/org/expeditee/gui/FrameUtils.java (modified) (6 diffs)
• src/org/expeditee/items/Item.java (modified) (4 diffs)
• src/org/expeditee/items/ItemUtils.java (modified) (4 diffs)
• tests/org/expeditee/gui/AttributeUtilsTest.java (added)

trunk/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" output="bin/tests" path="tests"/>
-        <classpathentry kind="src" output="bin/src" path="src"/>
+        <classpathentry kind="src" path="tests"/>
+        <classpathentry kind="src" path="src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>

trunk/src/org/expeditee/agents/ComputeTree.java

@@ -96 +96 @@
 
                         if (value == null) {
-                                value = AttributeUtils.getDoubleValue(((Text) i)
-                                                .getText());
+                                value = AttributeUtils.getDoubleValue(((Text) i).getFirstLine());
                         }
 

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

@@ -625 +625 @@
                         return "";
 
+                int lineSeparator = toStrip.indexOf(Character.LINE_SEPARATOR);
+                if(lineSeparator > 0){
+                        toStrip = toStrip.substring(0,lineSeparator);
+                }
+                
                 int ind = toStrip.lastIndexOf(SEPARATOR_CHAR);
 
@@ -634 +639 @@
                         }
                         // It is a value with no attribute.
-                        return toStrip;
+                        return toStrip.trim();
                 }
 
@@ -663 +668 @@
         }
 
+        /**
+         * 
+         * @param text
+         * @param value
+         */
         public static void setSingleValue(Text text, String value) {
                 assert (value != null);

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

@@ -39 +39 @@
 public class Frame implements ImageObserver {
 
-        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.WHITE, Color.GRAY,
+        public static Color[] COLOR_WHEEL = { 
                         new Color(235, 235, 235), new Color(225, 225, 255),
                         new Color(195, 255, 255), new Color(225, 255, 225),
                         new Color(255, 255, 195), new Color(255, 225, 225),
-                        new Color(255, 195, 255), null };
+                        new Color(255, 195, 255), Color.WHITE,
+                        Color.GRAY, Color.DARK_GRAY,Color.BLACK, null };
 
         // The various attributes of this Frame

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

@@ -764 +764 @@
                         // check if this was the profile frame (and thus needs
                         // re-parsing)
-                        if (toSave.getFramesetName().toLowerCase().equals(
-                                        UserSettings.Username.toLowerCase())) {
-                                FrameUtils.ParseProfile(FrameIO.LoadFrame(toSave
-                                                .getFramesetName()
-                                                + "1"));
+                        if (isProfileFrame(toSave)) {
+                                Frame profile = FrameIO.LoadFrame(toSave.getFramesetName()+ "1");
+                                assert(profile != null);
+                                FrameUtils.ParseProfile(profile);
                         }
                 } catch (IOException ioe) {
-                        // ioe.printStackTrace();
+                        ioe.getStackTrace();
                         Logger.Log(ioe);
                         return null;
@@ -777 +776 @@
 
                 return writer.getFileContents();
+        }
+
+        /**
+         * Checks if a frame is in the current user profile frameset.
+         * @param toCheck the frame to check
+         * @return true if the frame is in the current user profile frameset
+         */
+        public static boolean isProfileFrame(Frame toCheck) {
+                if(toCheck.getNumber() == 0)
+                        return false;
+                return toCheck.getFramesetName()
+                .equalsIgnoreCase(UserSettings.Username);
         }
 

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

@@ -489 +489 @@
                 Item current = FrameUtils.getCurrentItem();
                 Frame currentFrame = DisplayIO.getCurrentFrame();
-                //Link or delink an item
-                if (ch.charAt(0) ==  KeyEvent.VK_L) {
+                // Link or delink an item
+                if (ch.charAt(0) == KeyEvent.VK_L) {
                         // If its not linked then link it to its self
                         if (current instanceof Text && current.getLink() == null) {
@@ -503 +503 @@
                                 current.setLink(null);
                         }
-                } else if (ch.charAt(0) ==  KeyEvent.VK_G) {
+                } else if (ch.charAt(0) == KeyEvent.VK_G) {
                         // If its not linked then link it to its self
                         if (current instanceof Text) {
@@ -513 +513 @@
                                 }
                         }
-                        if (current.getLink() != null){
+                        if (current.getLink() != null) {
                                 NavigationActions.Goto(current.getAbsoluteLink());
                                 return;
                         }
-                } else if (ch.charAt(0) ==  KeyEvent.VK_A) {
+                } else if (ch.charAt(0) == KeyEvent.VK_A) {
                         // If its not linked then link it to its self
                         if (current instanceof Text && current.getAction() == null) {
                                 String text = ((Text) current).getText().trim();
-                                //first trim the annotation
+                                // first trim the annotation
                                 if (text.startsWith("@")) {
                                         text = text.substring(1).trim();
                                 }
-                                //then trim the action
+                                // then trim the action
                                 String lowerCaseText = text.toLowerCase();
                                 if (lowerCaseText.startsWith("a:")) {
@@ -531 +531 @@
                                 } else if (lowerCaseText.startsWith("action:")) {
                                         text = text.substring("action:".length()).trim();
-                                        
+
                                 }
                                 current.setAction(text);
@@ -624 +624 @@
                         processChar((char) KeyEvent.VK_DELETE, e.isShiftDown());
                         FrameMouseActions.delete(current);
-                }else if (ch.charAt(0) == KeyEvent.VK_F) {
+                } else if (ch.charAt(0) == KeyEvent.VK_F) {
                         // perform a delete operation
                         Actions.PerformAction(currentFrame, null, "Format");
@@ -662 +662 @@
                         }
                 }
-                        FrameGraphics.Repaint();
+                FrameGraphics.Repaint();
         }
 
@@ -814 +814 @@
                         break;
                 case Refresh:
-                        Repaint(on);
+                        Refresh(on);
                         break;
                 }
@@ -1582 +1582 @@
          *            This Item is currently ignored
          */
-        private static void Repaint(Item ignored) {
-                FrameUtils.Parse(DisplayIO.getCurrentFrame());
+        private static void Refresh(Item ignored) {
+                Frame currentFrame = DisplayIO.getCurrentFrame();
+                if (FrameIO.isProfileFrame(currentFrame)) {
+                        //TODO ensure that users can not delete the first frame in a frameset...
+                        //TODO handle the case when users manually delete the first frame in a frameset from the filesystem
+                        Frame profile = FrameIO.LoadFrame(currentFrame.getFramesetName()
+                                        + "1");
+                        assert (profile != null);
+                        FrameUtils.ParseProfile(profile);
+                } else {
+                        FrameUtils.Parse(currentFrame);
+                }
                 // Need to update the cursor for when text items change to @b pictures
                 // etc and the text cursor is showing

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

@@ -577 +577 @@
                 // check for all tags setting user values
                 for (Item item : items) {
+                        if (!item.isAnnotation())
+                                continue;
+                        
                         if (ItemUtils.startsWithTag(item, "@HomeFrame")) {
                                 String first = getLink(item, UserSettings.FirstFrame);
@@ -585 +588 @@
                                 // warn the user
                                 else {
-                                        FrameGraphics.WarningMessage("Home frame: " + first
-                                                        + " is not a valid frame.");
+                                        //FrameGraphics.WarningMessage("Home frame: " + first
+                                        //              + " is not a valid frame.");
                                         UserSettings.FirstFrame = profile.getName();
                                 }
@@ -638 +641 @@
                         } else if (ItemUtils.startsWithTag(item, "@FramesetDir")) {
                                 String dir = getDir(item, null);
-                                if (dir != null)
+                                if (dir != null){
                                         UserSettings.FrameDirs.add(dir);
+                                }
                         } else if (ItemUtils.startsWithTag(item, "@LogDir")) {
                                 org.expeditee.gui.FrameIO.LOGS_DIR = getDir(item,
@@ -658 +662 @@
                         } else if (ItemUtils.startsWithTag(item, "@FramesetDirs")) {
                                 UserSettings.FrameDirs.addAll(getDirs(item));
+                        } else {
+                                
                         }
                 }
@@ -750 +756 @@
                                 else
                                         return name + File.separator;
-                        }
-                }
-
+                        }else{
+                                FrameGraphics.ErrorMessage("Directory not found: " + name);
+                        }
+                }else{
+                        FrameGraphics.WarningMessage("Missing value for profile attribute" + name);
+                }
                 return alt;
         }
@@ -1404 +1413 @@
                                 for (File helpFrameset : helpFramesets) {
                                         String framesetName = helpFrameset.getName();
+                                        if(!FrameIO.isValidFramesetName(framesetName))
+                                                continue;
                                         Frame indexFrame = FrameIO.LoadFrame(framesetName + '1');
                                         // Look through the folder for help index pages

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

@@ -98 +98 @@
          * this Item.
          */
-        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.RED, Color.BLUE,
-                        Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(), Color.WHITE, null };
-
-        public static Color[] FILL_COLOR_WHEEL = { Color.BLACK,
-                        new Color(255, 150, 150), new Color(150, 150, 255),
-                        new Color(150, 255, 150), new Color(255, 150, 255),
-                        new Color(255, 255, 100), Color.WHITE, null };
+        public static Color[] COLOR_WHEEL = { Color.RED, Color.BLUE, Item.GREEN,
+                        Color.MAGENTA, Color.YELLOW.darker(), Color.BLACK, Color.DARK_GRAY,
+                        Color.GRAY, Color.WHITE, null };
+
+        public static Color[] FILL_COLOR_WHEEL = { new Color(255, 150, 150),
+                        new Color(150, 150, 255), new Color(150, 255, 150),
+                        new Color(255, 150, 255), new Color(255, 255, 100), Color.WHITE,
+                        Color.GRAY, Color.DARK_GRAY, Color.BLACK, null };
 
         public static final int UNCHANGED_CURSOR = -100;
@@ -116 +117 @@
         public static final int CROP_CURSOR = Cursor.CROSSHAIR_CURSOR;
 
-        //The default value for integer attributes
+        // The default value for integer attributes
         public static final int DEFAULT_INTEGER = -1;
 
@@ -173 +174 @@
                 dest._mode = SelectedMode.None;
                 dest._lastMode = source._mode;
-                
+
                 Frame parent = source.getParentOrCurrentFrame();
                 // TODO MIKE says maybe we could tighten up and only give items ID's if
@@ -1325 +1326 @@
                         // only set position if the other dot is still fixed to the
                         // frame
-                        if (/*this.isFloating() &&*/ !other.isFloating()) {
+                        if (/* this.isFloating() && */!other.isFloating()) {
                                 if (c.getType() == Constraint.HORIZONTAL) {
                                         if (other.getY() != y)

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

@@ -1 +1 @@
 package org.expeditee.items;
 
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Image;
 import java.awt.image.ImageObserver;
 import java.io.File;
@@ -17 +14 @@
 import java.util.Map;
 
-import javax.swing.JFrame;
-
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.DisplayIO;
@@ -30 +25 @@
  */
 public class ItemUtils {
-        private static JFrame _jf = new JFrame();
-
         // Tag constants
         public static final int TAG_SORT = 0;
@@ -321 +314 @@
 
         /**
-         * Returns a FontMetrics object that corresponds to the given Font.
-         * 
-         * @param font
-         *            The Font to derive the FontMetrics from
-         * @return FontMetrics that correspond to the given Font
-         */
-        public static FontMetrics getFontMetrics(Font font) {
-                return _jf.getFontMetrics(font);
-        }
-
-        public static Image CreateImage(int x, int y) {
-                return _jf.createImage(x, y);
-        }
-
-        /**
          * Creates a picture object from the information stored in the given Text
          * object. <br>