Changeset 48

Timestamp:

05/14/08 18:52:10 (16 years ago)

Author:

ra33

Message:

Made both types of messages (normal and overwrite mode) output the numbered prefix

Location:

trunk/src/org/expeditee

Files:

• agents/Format.java (modified) (1 diff)
• gui/AttributeUtils.java (modified) (6 diffs)
• gui/FrameGraphics.java (modified) (5 diffs)

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

@@ -165 +165 @@
         @Override
         protected void finalise(Frame start) {
-                /*
-                 * if(_success) message("Formating complete.");
-                 */
+                 if(_success) overwriteMessage("Formating complete.");
         }
 

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

@@ -66 +66 @@
                         _GetMethods = new LinkedList<Method>();
                         _GetMethods.add(Item.class.getMethod("getDateCreated", param));
-                        _GetMethods.add(Item.class.getMethod("getSize", param));
+                        
                         _GetMethods.add(Item.class.getMethod("getColor", param));
                         _GetMethods.add(Item.class.getMethod("getBackgroundColor", param));
@@ -73 +73 @@
                         _GetMethods.add(Item.class.getMethod("getFillColor", param));
                         _GetMethods.add(Item.class.getMethod("getFillPattern", param));
-
+                        _GetMethods.add(Item.class.getMethod("getThickness", param));
+                        
                         _GetMethods.add(Item.class.getMethod("getOwner", param));
                         _GetMethods.add(Item.class.getMethod("getLinkMark", param));
@@ -98 +99 @@
                         _GetMethods.add(Text.class.getMethod("getJustification", param));
                         _GetMethods.add(Text.class.getMethod("getWidth", param));
+                        _GetMethods.add(Text.class.getMethod("getSize", param));
 
                         _GetMethods.add(Frame.class.getMethod("getOwner", param));
@@ -238 +240 @@
                                         Object o = m.invoke(toExtract, (Object[]) null);
                                         if (o != null) {
-                                                // Class[] param = {o.getClass()};
-                                                // convert the returned object to a string
-                                                // try {
-                                                /*
-                                                 * //convert object types to primitives if(o.getClass() ==
-                                                 * Integer.class) param[0] = int.class; else
-                                                 * if(o.getClass() == LinkedList.class) param[0] =
-                                                 * List.class; else if(o.getClass() == Float.class)
-                                                 * param[0] = float.class; else if(o.getClass() ==
-                                                 * Double.class) param[0] = double.class;
-                                                 */
-                                                // the class must have both set and get methods for an
-                                                // attribute
-                                                // (if it has no set method this will throw an
-                                                // exception)
-                                                // toExtract.getClass().getMethod("set" +
-                                                // m.getName().substring(3), param);
-                                                // Convert the values returned into human readable
-                                                // values
                                                 if (o instanceof Integer) {
                                                         if (m.getName().endsWith("Justification")
@@ -273 +256 @@
                                                 } else if (o instanceof Float) {
                                                         // -1 indicates default value
-                                                        if (((Float) o) > -1)
+                                                        if (((Float) o) > 0.0001)
                                                                 attributes.append(m.getName().substring(3))
                                                                                 .append(SEPARATOR_STRING).append(o)
@@ -279 +262 @@
                                                 } else if (o instanceof Double) {
                                                         // -1 indicates default value
-                                                        if (((Double) o) > -1)
+                                                        if (((Double) o) > 0.0001)
                                                                 attributes.append(m.getName().substring(3))
                                                                                 .append(SEPARATOR_STRING).append(o)

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

@@ -50 +50 @@
 
         // the number of messages currently shown (used for scrolling up)
-        private static int _MessageCount = 1;
+        private static int _MessageCount = 0;
 
         // modes
@@ -572 +572 @@
                 for (int ind = Messages.length - 1; ind >= 0; ind--) {
                         if (Messages[ind] != null) {
-                                Messages[ind].setText(message);
+                                Messages[ind].setText(getMessagePrefix(false) + message);
                                 Repaint();
                                 return;
@@ -641 +641 @@
                         for (int i = 0; i < Messages.length; i++) {
                                 if (Messages[i] == null) {
-                                        Messages[i] = new Text(-1, "@" + _MessageCount++ + ": "
+                                        Messages[i] = new Text(-1, getMessagePrefix(true)
                                                         + message);
                                         Messages[i].setPosition(20, pos);
@@ -669 +669 @@
                 Text last = Messages[Messages.length - 1];
                 last.setColor(color);
-                last.setText("@" + _MessageCount++ + ": " + message);
+                last.setText(getMessagePrefix(true) + message);
                 last.setLink(link);
 
@@ -676 +676 @@
                 MessageLink.setLink(_creator.getCurrent());
                 Repaint();
+        }
+
+        private static String getMessagePrefix(boolean incrementCounter) {
+                if (incrementCounter)
+                        _MessageCount++;
+                return "@" + _MessageCount + ": ";
         }