Changeset 67 for trunk/src/org/expeditee/io/ExpWriter.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/ExpWriter.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.expeditee.io;
 
-import java.awt.Rectangle;
 import java.io.File;
 import java.io.FileWriter;
@@ -7 +6 @@
 import java.lang.reflect.Method;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -17 +15 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
-import org.expeditee.items.Text;
 import org.expeditee.items.WidgetCorner;
 import org.expeditee.items.WidgetEdge;
@@ -34 +31 @@
         private StringBuilder _stringWriter = null;
 
-        // keep track of methods that are put on the same line
-        private static LinkedHashMap<String, Method> _ItemTags = null;
-
-        private static LinkedHashMap<String, Method> _FrameTags = null;
-
         private static final char TERMINATOR = 'Z';
 
         public ExpWriter() {
-                if (_ItemTags != null && _FrameTags != null)
-                        return;
-
-                _ItemTags = new LinkedHashMap<String, Method>();
-                _FrameTags = new LinkedHashMap<String, Method>();
-
-                Class[] param = {};
-
-                try {
-                        _FrameTags.put("V", Frame.class.getMethod("getVersion", param));
-                        _FrameTags.put("p", Frame.class.getMethod("getProtection", param));
-                        _FrameTags.put("U", Frame.class.getMethod("getOwner", param));
-                        _FrameTags.put("D", Frame.class.getMethod("getDateCreated", param));
-                        _FrameTags.put("M", Frame.class.getMethod("getLastModifyUser",
-                                        param));
-                        _FrameTags.put("d", Frame.class.getMethod("getLastModifyDate",
-                                        param));
-                        _FrameTags.put("F", Frame.class.getMethod("getFrozenDate", param));
-
-                        _FrameTags.put("O", Frame.class.getMethod("getForegroundColor",
-                                        param));
-                        _FrameTags.put("B", Frame.class.getMethod("getBackgroundColor",
-                                        param));
-
-                        _ItemTags.put("S", Item.class.getMethod("getTypeAndID", param));
-                        _ItemTags.put("s", Item.class.getMethod("getDateCreated", param));
-                        _ItemTags.put("d", Item.class.getMethod("getColor", param));
-                        _ItemTags.put("G", Item.class
-                                        .getMethod("getBackgroundColor", param));
-                        _ItemTags.put("P", Item.class.getMethod("getPosition", param));
-                        _ItemTags.put("F", Item.class.getMethod("getLink", param));
-                        _ItemTags.put("X", Item.class.getMethod("getAction", param));
-                        _ItemTags.put("x", Item.class.getMethod("getActionMark", param));
-                        _ItemTags.put("U", Item.class.getMethod("getActionCursorEnter",
-                                        param));
-                        _ItemTags.put("V", Item.class.getMethod("getActionCursorLeave",
-                                        param));
-                        _ItemTags.put("W", Item.class.getMethod("getActionEnterFrame",
-                                        param));
-                        _ItemTags.put("Y", Item.class.getMethod("getActionLeaveFrame",
-                                        param));
-                        _ItemTags.put("D", Item.class.getMethod("getData", param));
-                        _ItemTags.put("u", Item.class.getMethod("getHighlight", param));
-                        _ItemTags.put("e", Item.class.getMethod("getFillColor", param));
-                        _ItemTags.put("i", Item.class.getMethod("getFillPattern", param));
-                        _ItemTags.put("o", Item.class.getMethod("getOwner", param));
-                        _ItemTags.put("n", Item.class.getMethod("getLinkMark", param));
-                        _ItemTags.put("q", Item.class.getMethod("getLinkFrameset", param));
-                        _ItemTags.put("y", Item.class.getMethod("getLinkTemplate", param));
-                        _ItemTags.put("g", Item.class.getMethod("getLinePattern", param));
-
-                        _ItemTags.put("j", Item.class.getMethod("getArrow", param));
-
-                        _ItemTags.put("f", Text.class.getMethod("getFont", param));
-                        _ItemTags.put("t", Text.class.getMethod("getSpacing", param));
-                        _ItemTags.put("T", Text.class.getMethod("getText", param));
-
-                        _ItemTags.put("a", Text.class.getMethod("getWordSpacing", param));
-                        _ItemTags.put("b", Text.class.getMethod("getLetterSpacing", param));
-                        _ItemTags
-                                        .put("m", Text.class.getMethod("getInitialSpacing", param));
-                        _ItemTags.put("w", Text.class.getMethod("getWidth", param));
-                        _ItemTags.put("k", Text.class.getMethod("getJustification", param));
-
-                        _ItemTags.put("h", Item.class.getMethod("getThickness", param));
-                        _ItemTags.put("l", Item.class.getMethod("getLineIDs", param));
-                        _ItemTags.put("c", Item.class.getMethod("getConstraintIDs", param));
-
-                } catch (Exception e) {
-                        e.printStackTrace();
-                }
+                super();
         }
 
@@ -128 +50 @@
                 } else
                         _writer = new ProxyWriter(new FileWriter(_filename));
+                
+                try {
+                        _ItemTags.put("S", Item.class.getMethod("getTypeAndID", new Class[] {}));
+                } catch (Exception e) {
+
+                }
         }
 
@@ -225 +153 @@
                 // Dont save the item if it is off the screen
                 if (item.offScreen()) {
-                        System.out.println("item offscreen!");
+                        //System.out.println("item offscreen!");
                         return;
                 }