Changeset 601

Timestamp:

12/10/13 17:58:08 (10 years ago)

Author:

jts21

Message:

Switch back to EXP format, revert changes to Picture class

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (1 diff)
• gui/AttributeUtils.java (modified) (13 diffs)
• gui/FrameIO.java (modified) (9 diffs)
• gui/FrameUtils.java (modified) (3 diffs)
• io/ExaReader.java (modified) (3 diffs)
• io/ExaWriter.java (modified) (4 diffs)
• io/WebParser.java (modified) (2 diffs)
• items/FrameBitmap.java (modified) (1 diff)
• items/FrameImage.java (modified) (1 diff)
• items/FramePicture.java (modified) (1 diff)
• items/ItemUtils.java (modified) (4 diffs)
• items/Picture.java (modified) (38 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -1362 +1362 @@
                 System.out.println(text.getText());
         }
-        
-        public static void testWriter(Frame frame) {
-                try {
-                        FrameWriter fw = new ExaWriter();
-                        fw.writeFrame(frame);
-                        String contents = fw.getFileContents();
-                        Frame newFrame;
-                        try {
-                                String nextName = frame.getFramesetName() + FrameIO.ReadINF(FrameIO.LoadFrame(frame.getFramesetName() + "0").getPath(), frame.getFramesetName(), true);
-                                System.out.println(nextName);
-                                newFrame = new ExaReader(nextName).readFrame(new BufferedReader(new StringReader(contents)));
-                                newFrame.setChanged(true);
-                                newFrame.setPath(frame.getPath());
-                                FrameIO.SaveFrame(newFrame);
-                                Text text = new Text(DisplayIO.getCurrentFrame().getNextItemID(), "New frame");
-                                text.setPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY);
-                                text.setLink(newFrame.getName());
-                                FrameMouseActions.pickup(text);
-                                
-                        } catch (Exception e) {
-                                e.printStackTrace();
-                        }
-
-        } catch (Exception e) {
-                e.printStackTrace();
-        }
-        }
-        
-        public static Item testPicture() {
-                // return new Picture(string, DisplayIO.getCurrentFrame());
-                Picture p = new Picture("/home/jts21/wallpaper.png", DisplayIO.getCurrentFrame());
-                p.setPosition(149, 189);
-                p.setCropStart(new Point(100, 100));
-                p.setCropEnd(new Point(200, 200));
-                p.setWidth(100);
-                // p.setPosition(100, 100);
-                // p.scale(0.1F, (int)FrameMouseActions.MouseX, (int)FrameMouseActions.MouseY);
-                
-                // p.setImageSource(string);
-                return p;
-        }
-        
-        public static void getAllItems(Frame frame) {
-                System.out.println(frame.getAllItems());
-        }
-        
-        public static void getItemsToSave(Frame frame) {
-                System.out.println(frame.getItemsToSave());
-        }
 }

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

@@ -29 +29 @@
 public class AttributeUtils {
 
-        // private static final int GET_LENGTH = "get".length();
-
-        //private static int SET_LENGTH = "set".length();
-
         public static final class Attribute {
                 public final String displayName;
@@ -48 +44 @@
                 
                 // the internal hashmap
-                private final HashMap<String, Attribute> map = new HashMap<String, Attribute>(256);
+                private final HashMap<String, Attribute> map;
                 // a list of keys in the order they were added (used to make attribute extraction consistent)
-                public final List<String> keys = new LinkedList<String>();
-                
-                // put an item at the end of the list
+                public final List<String> keys;
+                
+                public AttributeSet(int size) {
+                        map = new HashMap<String, Attribute>(size);
+                        keys = new LinkedList<String>();
+                }
+                
                 public void put(String attributeName, Method getter, Method setter) {
                         if(map.containsKey(attributeName.toLowerCase())) {
@@ -63 +63 @@
                 }
                 
-                // put an item at the start of the list
-                public void ins(String attributeName, Method getter, Method setter) {
-                        if(map.containsKey(attributeName.toLowerCase())) {
-                                System.err.println(this + " already contains key '" + attributeName + "', overwriting value!");
-                                keys.remove(attributeName.toLowerCase());
-                        }
-                        // we keep an ordered list of attributes for extraction
-                        keys.add(0, attributeName.toLowerCase());
-                        map.put(attributeName.toLowerCase(), new Attribute(attributeName, getter, setter));
-                }
-                
-                /**
-                 * Create a second reference the the same Attribute, using a different name
-                 * Does not modify the list of keys
-                 */
+                // Create a second reference the the same Attribute, using a different name
+                // Does not modify the list of keys
                 public void alias(String alias, String name) {
                         if(map.containsKey(name.toLowerCase())) {
@@ -86 +73 @@
                 }
                 
-                public void putAll(AttributeSet toAdd) {
-                        keys.addAll(toAdd.keys);
-                        map.putAll(toAdd.map);
-                }
-                
-                public Attribute remove(String name) {
-                        keys.remove(name);
-                        return map.remove(name);
-                }
-                
                 public boolean containsKey(String key) {
                         return map.containsKey(key);
@@ -105 +82 @@
         }
         
-        
-        // Frames
-        // Common list of attributes
-        public static final AttributeSet _FrameAttrib = new AttributeSet();
-        // List of attributes that may be set
-        public static final AttributeSet _FrameAttribSet = new AttributeSet();
-        // List of attributes that should be saved
-        public static final AttributeSet _FrameAttribSave = new AttributeSet();
-        // Items
-        // Common list of attributes
-        public static final AttributeSet _Attrib = new AttributeSet();
-        // List of attributes that may be set
-        public static final AttributeSet _AttribSet = new AttributeSet();
-        // List of attributes that should be saved
-        public static final AttributeSet _AttribSave = new AttributeSet();
-        
-        // List of method names to ignore when searching for a match
-        // private static List<Method> _GetMethods = null;
-
-        // private static HashMap<String, Method> _SetMethods = null;
+        public static final AttributeSet _Attrib = new AttributeSet(128);
+        public static final AttributeSet _FrameAttrib = new AttributeSet(16);
+
 
         // List of attributes which are ignored when extracting attributes
@@ -210 +170 @@
                                                             Frame.class.getMethod("setOwner", pString));
                         _FrameAttrib.put("DateCreated",     Frame.class.getMethod("getDateCreated"),
-                                                            Frame.class.getMethod("setDateCreated", pString));
+                                                            null);
                         _FrameAttrib.put("LastModifyUser",  Frame.class.getMethod("getLastModifyUser"),
-                                                            Frame.class.getMethod("setLastModifyUser", pString));
+                                                            null);
                         _FrameAttrib.put("LastModifyDate",  Frame.class.getMethod("getLastModifyDate"),
-                                                            Frame.class.getMethod("setLastModifyDate", pString));
+                                                            null);
                         _FrameAttrib.put("ForegroundColor", Frame.class.getMethod("getForegroundColor"),
                                                             Frame.class.getMethod("setForegroundColor", pColor));
@@ -220 +180 @@
                                                             Frame.class.getMethod("setBackgroundColor", pColor));
                         
-                        // FrameAttribSet has some stuff removed (so users can't set the creation date), and some aliases
-                        _FrameAttribSet.putAll(_FrameAttrib);
-                        _FrameAttribSet.remove("DateCreated");
-                        _FrameAttribSet.remove("LastModifyUser");
-                        _FrameAttribSet.remove("LastModifyDate");
-                        _FrameAttribSet.alias("fgc",        "foregroundcolor");
-                        _FrameAttribSet.alias("bgc",        "backgroundcolor");
-                        _FrameAttribSet.alias("p",          "permission");
-                        
-                        // FrameAttribSave has some extra stuff
-                        _FrameAttribSave.putAll(_FrameAttrib);
-                        _FrameAttribSave.ins("Version",Frame.class.getMethod("getVersion"),
-                                                            Frame.class.getMethod("setVersion", pInt));
-                        _FrameAttribSave.put("FrozenDate",  Frame.class.getMethod("getFrozenDate"),
-                                                            Frame.class.getMethod("setFrozenDate", pString));
+                        // aliases for attribute setting
+                        _FrameAttrib.alias("fgc",        "foregroundcolor");
+                        _FrameAttrib.alias("bgc",        "backgroundcolor");
+                        _FrameAttrib.alias("p",          "permission");
+                        
                         
                         // Generic Items
@@ -309 +259 @@
                         _Attrib.put("Width",                Item.class.getMethod("getWidthToSave"),
                                                             Item.class.getMethod("setWidth", pIntO));
+                        _Attrib.put("X",                    null,
+                                                            Item.class.getMethod("setX", pFloat));
+                        _Attrib.put("Y",                    null,
+                                                            Item.class.getMethod("setY", pFloat));
                         
                         // Text Items
@@ -318 +272 @@
                                                             Text.class.getMethod("setJustification", pJustification));
                         
-                        // Picture Items
-                        _Attrib.put("Scale",                Picture.class.getMethod("getScaleToSave"),
-                                                            Picture.class.getMethod("setScale", pFloat));
-                        _Attrib.ins("CropStart",            Picture.class.getMethod("getCropStart"),
-                                                            Picture.class.getMethod("setCropStart", pPoint));
-                        _Attrib.ins("CropEnd",              Picture.class.getMethod("getCropEnd"),
-                                                            Picture.class.getMethod("setCropEnd", pPoint));
-                        _Attrib.ins("Image",                Picture.class.getMethod("getImageSource"),
-                                                            Picture.class.getMethod("setImageSource", pString));
-                        
-                        
-                        // AttribSet has some extra stuff and some aliases
-                        _AttribSet.putAll(_Attrib);
-                        _AttribSet.put("X",                 null,
-                                                            Item.class.getMethod("setX", pFloat));
-                        _AttribSet.put("Y",                 null,
-                                                            Item.class.getMethod("setY", pFloat));
-                        _AttribSet.alias("pos",             "position");
-                        _AttribSet.alias("p",               "position");
-                        _AttribSet.alias("xy",              "position");
-                        _AttribSet.alias("a",               "action");
-                        _AttribSet.alias("d",               "data");
-                        _AttribSet.alias("f",               "formula");
-                        _AttribSet.alias("s",               "size");
-                        _AttribSet.alias("l",               "link");
-                        _AttribSet.alias("ab",              "anchorbottom");
-                        _AttribSet.alias("ar",              "anchorright");
-                        _AttribSet.alias("t",               "thickness");
-                        // _SetAttrib.alias("c",               "color"); // breaks circle creation
-                        _AttribSet.alias("bgc",             "backgroundcolor");
-                        _AttribSet.alias("bc",              "bordercolor");
-                        _AttribSet.alias("fc",              "fillcolor");
-                        _AttribSet.alias("gc",              "gradientcolor");
-                        _AttribSet.alias("ga",              "gradientangle");
-                        _AttribSet.alias("fp",              "fillpattern");
-                        _AttribSet.alias("lm",              "linkmark");
-                        _AttribSet.alias("am",              "actionmark");
-                        _AttribSet.alias("dt",              "dottype");
-                        _AttribSet.alias("fill",            "filled");
-                        _AttribSet.alias("lp",              "linepattern");
-                        _AttribSet.alias("lf",              "linkframeset");
-                        _AttribSet.alias("lt",              "linktemplate");
-                        _AttribSet.alias("face",            "fontstyle");
-                        _AttribSet.alias("j",               "justification");
-                        _AttribSet.alias("w",               "width");
-                        _AttribSet.alias("as",              "autostamp");
-                        
-                        
-                        // AttribSave has some extra stuff and some stuff removed
-                        _AttribSave.putAll(_Attrib);
-                        _AttribSave.remove("save");
-                        _AttribSave.remove("autostamp");
-                        _AttribSave.put("Spacing",          Text.class.getMethod("getSpacing"),
-                                                            Text.class.getMethod("setSpacing", pInt));
-                        _AttribSave.put("WordSpacing",      Text.class.getMethod("getWordSpacing"),
-                                                            Text.class.getMethod("setWordSpacing", pInt));
-                        _AttribSave.put("LetterSpacing",    Text.class.getMethod("getLetterSpacing"),
-                                                            Text.class.getMethod("setLetterSpacing", pInt));
-                        _AttribSave.put("InitialSpacing",   Text.class.getMethod("getInitialSpacing"),
-                                                            Text.class.getMethod("setInitialSpacing", pInt));
-                        _AttribSave.put("Text",             Text.class.getMethod("getText"),
-                                                            Text.class.getMethod("appendLine", pString));
+                        // Aliases for attribute setting
+                        _Attrib.alias("pos",                "position");
+                        _Attrib.alias("p",                  "position");
+                        _Attrib.alias("xy",                 "position");
+                        _Attrib.alias("a",                  "action");
+                        _Attrib.alias("d",                  "data");
+                        _Attrib.alias("f",                  "formula");
+                        _Attrib.alias("s",                  "size");
+                        _Attrib.alias("l",                  "link");
+                        _Attrib.alias("ab",                 "anchorbottom");
+                        _Attrib.alias("ar",                 "anchorright");
+                        _Attrib.alias("t",                  "thickness");
+                        // _Attrib.alias("c",                  "color"); // breaks circle creation
+                        _Attrib.alias("bgc",                "backgroundcolor");
+                        _Attrib.alias("bc",                 "bordercolor");
+                        _Attrib.alias("fc",                 "fillcolor");
+                        _Attrib.alias("gc",                 "gradientcolor");
+                        _Attrib.alias("ga",                 "gradientangle");
+                        _Attrib.alias("fp",                 "fillpattern");
+                        _Attrib.alias("lm",                 "linkmark");
+                        _Attrib.alias("am",                 "actionmark");
+                        _Attrib.alias("dt",                 "dottype");
+                        _Attrib.alias("fill",               "filled");
+                        _Attrib.alias("lp",                 "linepattern");
+                        _Attrib.alias("lf",                 "linkframeset");
+                        _Attrib.alias("lt",                 "linktemplate");
+                        _Attrib.alias("face",               "fontstyle");
+                        _Attrib.alias("j",                  "justification");
+                        _Attrib.alias("w",                  "width");
+                        _Attrib.alias("as",                 "autostamp");
                         
 
@@ -431 +353 @@
                         Attribute a = as.get(prop);
                         // Make sure the classes of the methods match the item
-                        if (a != null && a.getter.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {
+                        if (a != null && a.getter != null && a.getter.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {
                                 
                                 try {
@@ -658 +580 @@
                                         } else if (_IgnoreSet.contains(stripped)) {
                                                 return false;
-                                        } else if (!(_AttribSet.containsKey(stripped))) {
-                                                return false;
                                         } else {
+                                                Attribute a = _Attrib.get(stripped);
+                                                if(a == null || a.setter == null) {
+                                                        return false;
+                                                }
                                                 String types = "";
-                                                for (Class c : _AttribSet.get(stripped).setter.getParameterTypes()) {
+                                                for (Class<?> c : a.setter.getParameterTypes()) {
                                                         types += c.getSimpleName() + " ";
                                                 }
@@ -710 +634 @@
                 // Separate multiple values if required
                 
-                Attribute a = _AttribSet.get(attribute);
+                Attribute a = _Attrib.get(attribute);
                 // if this is not the name of a method, it may be the name of an agent
-                if (a == null) {
+                if (a == null || a.setter == null) {
                         // System.out.println("Attrib not found for: " + attribute);
                         return false;
@@ -722 +646 @@
                         possibles.add(a.setter);
                 int i = 0;
-                while (_AttribSet.containsKey(attribute + i)) {
-                        Method m = _AttribSet.get(attribute + i).setter;
+                while (_Attrib.containsKey(attribute + i)) {
+                        Method m = _Attrib.get(attribute + i).setter;
+                        if(m == null) {
+                                break;
+                        }
                         if (m.getDeclaringClass().isAssignableFrom(toSet.getClass())) {
                                 possibles.add(m);

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

@@ -22 +22 @@
 import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.io.Conversion;
-import org.expeditee.io.ExaReader;
-import org.expeditee.io.ExaWriter;
 import org.expeditee.io.ExpReader;
 import org.expeditee.io.ExpWriter;
@@ -277 +275 @@
                         return null;
 
-                // check for the exa file name format
+                // check for the new file name format
                 String fullPath = source + Conversion.getFrameNumber(frameName)
-                                + ExaReader.EXTENTION;
+                                + ExpReader.EXTENTION;
                 tester = new File(fullPath);
-                
+
                 if (tester.exists())
                         return fullPath;
-                
-                // check for the exp file name format
-                fullPath = source + Conversion.getFrameNumber(frameName)
-                                + ExpReader.EXTENTION;
-                tester = new File(fullPath);
-
-                if (tester.exists())
-                        return fullPath;
-
-                // check for kms file name format
+
+                // check for oldfile name format
                 fullPath = source + Conversion.getFramesetName(frameName) + "."
                                 + Conversion.getFrameNumber(frameName);
@@ -364 +354 @@
                         FrameReader reader;
 
-                        if(fullPath.endsWith(ExaReader.EXTENTION)) {
-                                reader = new ExaReader(frameName);
-                        } else if (fullPath.endsWith(ExpReader.EXTENTION)) {
+                        if (fullPath.endsWith(ExpReader.EXTENTION)) {
                                 reader = new ExpReader(frameName);
                         } else {
@@ -590 +578 @@
                         _Cache.remove(oldFrameName);
 
-                boolean deleted = false;
-                while(source != null) {
-                        File del = new File(source);
-                        
-                        java.io.FileInputStream ff = new java.io.FileInputStream(del);
-                ff.close();
-    
-                if (del.delete()) {
-                        deleted = true;
-                }
-                
-                // check if there are any save files from other formats still existing
-                source = getFrameFullPathName(toDelete.getPath(), toDelete.getName());
-                }
-                
-                if(deleted) {
+                File del = new File(source);
+
+                java.io.FileInputStream ff = new java.io.FileInputStream(del);
+                ff.close();
+
+                if (del.delete()) {
                         return toDelete.getName();
                 }
@@ -882 +860 @@
                         checkBackup = false;
                 }
-                
-                FrameWriter writer = new ExaWriter();
+
+                FrameWriter writer = null;
                 int savedVersion;
-                boolean converted = true;
-
                 try {
-                        
                         // if its a new frame or an existing Exp frame...
-                if(fullPath == null || fullPath.endsWith(ExaReader.EXTENTION)) {
-                        savedVersion = ExaReader.getVersion(fullPath);
-                        converted = false;
-                } else if (fullPath.endsWith(ExpReader.EXTENTION)) {
-                        // writer = new ExpWriter();
-                        savedVersion = ExpReader.getVersion(fullPath);
-                        // delete the old file since we're replacing it with exa format
-                } else {
-                        // writer = new KMSWriter();
-                        savedVersion = KMSReader.getVersion(fullPath);
-                        // delete the old file since we're replacing it with exa format
-                }
+                        if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {
+                                writer = new ExpWriter();
+                                savedVersion = ExpReader.getVersion(fullPath);
+                        } else {
+                                writer = new KMSWriter();
+                                savedVersion = KMSReader.getVersion(fullPath);
+                        }
 
                         // Check if the frame doesnt exist
@@ -989 +959 @@
                         // FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
                         writer.writeFrame(toSave);
-                        
-                        // Now that we've written the file, erase the old format file
-                        // (on second thoughts probably better to leave a backup, getFrameFullPathName will preferentially return EXA anyway)
-                        if(converted && !getFrameFullPathName(toSave.getPath(), toSave.getName()).equals(fullPath)) {
-                                MessageBay.displayMessage("Converted " + toSave.getName() + " to EXA format");
-                                // new File(fullPath).delete();
-                        }
-                        
                         // FrameGraphics.setMode(oldMode, true);
                         toSave.setSaved();
@@ -1530 +1492 @@
                 String filename = PUBLIC_PATH + Conversion.getFramesetName(frameName)
                                 + File.separator + Conversion.getFrameNumber(frameName)
-                                + ExaReader.EXTENTION;
+                                + ExpReader.EXTENTION;
 
                 File file = new File(filename);
@@ -1536 +1498 @@
                 if (file.exists()) {
                         // Check the versions
-                        int savedVersion = ExaReader.getVersion(filename);
+                        int savedVersion = ExpReader.getVersion(filename);
 
                         if (savedVersion > version) {
@@ -1554 +1516 @@
                                                 + nextNum;
                                 filename = PUBLIC_PATH + Conversion.getFramesetName(frameName)
-                                                + File.separator + nextNum + ExaReader.EXTENTION;
+                                                + File.separator + nextNum + ExpReader.EXTENTION;
 
                                 // Show the messages alerting the user

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

@@ -525 +525 @@
                 }
                 frame.addItem(pic);
-                frame.removeItem(txt);
 
                 return true;
@@ -927 +926 @@
                                                                         }
                                                                         // check for frame images
-                                                                /*} else if (ItemUtils.startsWithTag(i,
+                                                                } else if (ItemUtils.startsWithTag(i,
                                                                                 ItemUtils.TAG_FRAME_IMAGE)
                                                                                 && i.getLink() != null
@@ -965 +964 @@
                                                                                                 toParse, null);
                                                                         }
-                                                                        toParse.addItem(image);*/
+                                                                        toParse.addItem(image);
                                                                 } else if (ItemUtils.startsWithTag(i, "@c")) {
                                                                         // Can only have a @c

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

@@ -15 +15 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
-import org.expeditee.items.Picture;
 
 /**
- * Reads exa format
+ * Experimental format which is designed to be more readable
+ * NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
  * 
  * @author jts21
@@ -109 +109 @@
                                 continue;
                         }
-                        Attribute attribute = AttributeUtils._FrameAttribSave.get(av[0].toLowerCase());
-                        if(attribute == null || attribute.setter == null) {
-                                System.err.println("Attribute '" + attribute + "' is not supported");
-                                continue;
-                        }
-                        Object[] vals = Conversion.Convert(attribute.setter, av[1]);
-                        try {
-                                attribute.setter.invoke(_frame, vals);
-                        } catch(Exception e) {
-                                System.err.println("Error running method: " + attribute.setter.getName());
-                                e.printStackTrace();
-                        }
+                        // TODO: NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
+//                      Attribute attribute = AttributeUtils._FrameAttrib.get(av[0].toLowerCase());
+//                      if(attribute == null || attribute.saveSetter == null) {
+//                              System.err.println("Attribute '" + attribute + "' is not supported");
+//                              continue;
+//                      }
+//                      Object[] vals = Conversion.Convert(attribute.saveSetter, av[1]);
+//                      try {
+//                              attribute.saveSetter.invoke(_frame, vals);
+//                      } catch(Exception e) {
+//                              System.err.println("Error running method: " + attribute.saveSetter.getName());
+//                              e.printStackTrace();
+//                      }
                         
                 }
@@ -164 +165 @@
                                 }
                         } else if(item != null) {
-                                Attribute attribute = AttributeUtils._AttribSave.get(av[0].toLowerCase());
-                                if(attribute == null || attribute.setter == null) {
-                                        System.err.println("Attribute '" + av[0] + "' is not supported");
-                                        continue;
-                                }
-                                Object[] vals = Conversion.Convert(attribute.setter, av[1]);
-                                try {
-                                        attribute.setter.invoke(item, vals);
-                                } catch(Exception e) {
-                                        System.err.println("Error running method: " + attribute.setter.getName());
-                                        e.printStackTrace();
-                                }
+                                // TODO: NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
+//                              Attribute attribute = AttributeUtils._Attrib.get(av[0].toLowerCase());
+//                              if(attribute == null || attribute.saveSetter == null) {
+//                                      System.err.println("Attribute '" + av[0] + "' is not supported");
+//                                      continue;
+//                              }
+//                              Object[] vals = Conversion.Convert(attribute.saveSetter, av[1]);
+//                              try {
+//                                      attribute.saveSetter.invoke(item, vals);
+//                              } catch(Exception e) {
+//                                      System.err.println("Error running method: " + attribute.saveSetter.getName());
+//                                      e.printStackTrace();
+//                              }
                         }
                 }

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

@@ -11 +11 @@
 
 import org.expeditee.gui.AttributeUtils;
-import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.AttributeUtils.Attribute;
 import org.expeditee.gui.Frame;
@@ -20 +19 @@
 
 /**
- * Writes frames as exa (Expeditee Attribute) format
- * Less efficient on disk space than the exp format, but it makes the save files human-readable
- *  and also simplifies things since it mostly uses the same attribute table as attribute extraction
+ * Experimental format which is designed to be more readable
+ * NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
  * 
  * @author jts21
@@ -94 +92 @@
 
         private void writeHeader(Frame frame) throws IOException {
-                for (String prop : AttributeUtils._FrameAttribSave.keys) {
-                        Attribute a = AttributeUtils._FrameAttribSave.get(prop);
-                        if(a.getter.getDeclaringClass().isAssignableFrom(frame.getClass())) {
-                                try {
-                                        Object o = a.getter.invoke(frame);
-                                        o = Conversion.ConvertToExpeditee(a.getter, o);
-                                        if (o != null) {
-                                                writeProperty(a.displayName, o);
-                                        }
-                                } catch (Exception e) {
-                                        e.printStackTrace();
-                                }
-                        }
-                }
+                // TODO: NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
+//              for (String prop : AttributeUtils._FrameAttrib.keys) {
+//                      Attribute a = AttributeUtils._FrameAttrib.get(prop);
+//                      if(a == null || a.saveGetter == null) {
+//                              continue;
+//                      }
+//                      if(a.saveGetter.getDeclaringClass().isAssignableFrom(frame.getClass())) {
+//                              try {
+//                                      Object o = a.saveGetter.invoke(frame);
+//                                      o = Conversion.ConvertToExpeditee(a.saveGetter, o);
+//                                      if (o != null) {
+//                                              writeProperty(a.displayName, o);
+//                                      }
+//                              } catch (Exception e) {
+//                                      e.printStackTrace();
+//                              }
+//                      }
+//              }
         }
         
@@ -120 +122 @@
                         }
                         writeLine("Item " + item.getClass().getName() + " " + item.getID());
-                        for (String prop : AttributeUtils._AttribSave.keys) {
-                                Attribute a = AttributeUtils._AttribSave.get(prop);
-                                Class<?> declarer = a.getter.getDeclaringClass();
-                                if (declarer.isAssignableFrom(item.getClass())) {
-                                        try {
-                                                Object o = a.getter.invoke(item);
-                                                o = Conversion.ConvertToExpeditee(a.getter, o);
-                                                if (o != null) {
-                                                        if (o instanceof List) {
-                                                                for (Object line : (List<?>) o) {
-                                                                        writeProperty(a.displayName, line);
-                                                                }
-                                                        } else {
-                                                                writeProperty(a.displayName, o);
-                                                        }
-                                                }
-                                        } catch (Exception e) {
-                                                e.printStackTrace();
-                                        }
-                                }
+                        for (String prop : AttributeUtils._Attrib.keys) {
+                                // TODO: NON FUNCTIONAL DUE TO CHANGES TO AttributeUtils
+//                              Attribute a = AttributeUtils._Attrib.get(prop);
+//                              if(a == null || a.saveGetter == null) {
+//                              continue;
+//                      }
+//                              Class<?> declarer = a.saveGetter.getDeclaringClass();
+//                              if (declarer.isAssignableFrom(item.getClass())) {
+//                                      try {
+//                                              Object o = a.saveGetter.invoke(item);
+//                                              o = Conversion.ConvertToExpeditee(a.saveGetter, o);
+//                                              if (o != null) {
+//                                                      if (o instanceof List) {
+//                                                              for (Object line : (List<?>) o) {
+//                                                                      writeProperty(a.displayName, line);
+//                                                              }
+//                                                      } else {
+//                                                              writeProperty(a.displayName, o);
+//                                                      }
+//                                              }
+//                                      } catch (Exception e) {
+//                                              e.printStackTrace();
+//                                      }
+//                              }
                         }
                 }

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

@@ -16 +16 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.ItemUtils;
@@ -452 +453 @@
                 ImageIO.write(img, "png", out);
 
-                if (cropEndX == null || cropStartX == null || cropEndY == null || cropStartY == null) {
-                        cropStartX = 0;
-                        cropStartY = 0;
-                        cropEndX = img.getWidth();
-                        cropEndY = img.getHeight();
-                }
-
                 if (width < 0) {
-                        width = img.getWidth();
-                }
-
-                Picture pic = new Picture(out.getName(), frame);
-                pic.setWidth(width);
-
-                // Have to divide the crop coords by the image scale, since Expeditee seems to always crop then scale
-                pic.setCropStart(new Point((int) (cropStartX / pic.getScale()), (int) (cropStartY / pic.getScale())));
-                pic.setCropEnd(new Point((int) (cropEndX / pic.getScale()), (int) (cropEndY / pic.getScale())));
-                pic.setPosition(x, y);
-                frame.addItem(pic);
+                        System.out.println("invalid width");
+                }
+                
+                String imageStr = "@i: " + out.getName() + " " + width;
+                
+                int scale = width / img.getWidth();
+                
+                if (!(cropEndX == null || cropStartX == null || cropEndY == null || cropStartY == null)) {
+                        imageStr += " " + (int) (cropStartX / scale) + " " + (int) (cropStartY / scale) + " " + (int) (cropEndX / scale) + " " + (int) (cropEndY / scale);
+                }
+                
+                Text text = new Text(imageStr);
+                text.setPosition(x, y);
+                
+                frame.addItem(text);
         }
 }

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

@@ -1 +1 @@
 package org.expeditee.items;
 
+import java.awt.Color;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
+import java.util.List;
 
-// TODO: Make this work with new Picture class
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameIO;
 
 //TODO tidy up the mess I caused with refresh during the period where I was going into XRay mode before saving
 
 public class FrameBitmap extends FramePicture {
+        public FrameBitmap(Text source, ImageObserver observer, Image image){
+                super(source, observer, image);
+        }
 
-        protected FrameBitmap(String path, ImageObserver observer) {
-            super(path, observer);
-    }
-//      public FrameBitmap(Text source, ImageObserver observer, Image image){
-//              super(source, observer, image);
-//      }
-//
-//      @Override
-//      public boolean refresh() {
-//              assert (getLink() != null);
-//              Frame frame = FrameIO.LoadFrame(getAbsoluteLink());
-//              // if the frame cant be found just use the current image
-//              if (frame == null) {
-//                      return false;
-//              }
-//
-//              List<Text> textList = frame.getBodyTextItems(false);
-//              if (textList.size() == 0)
-//                      return false;
-//              List<String> imageLines = textList.get(0).getTextList();
-//              int width = 0;
-//              int height = imageLines.size();
-//              // Determine the image width by finding the widest line of text
-//              for (String s : imageLines) {
-//                      if (s.length() > width)
-//                              width = s.length();
-//              }
-//              
-//              if(width == 0)
-//                      return false;
-//              
-//              BufferedImage bi = new BufferedImage(width, height,
-//                              BufferedImage.TYPE_INT_ARGB);
-//              // now set the bits on the image
-//              final int transparent = (new Color(0F, 0F, 0F, 0F)).getRGB();
-//              final int main = getPaintColor().getRGB();
-//              final Color c = getPaintColor();
-//              int currentColor = main;
-//              int row = 0;
-//              for (String s : imageLines) {
-//                      for (int i = 0; i < width; i++) {
-//                              currentColor = transparent;
-//                              if (i < s.length()) {
-//                                      char currentPixel = s.charAt(i);
-//                                      // Space is transparent as is 0
-//                                      if (Character.isDigit(currentPixel)) {
-//                                              int alpha = Math.round((currentPixel - '0') * 25.5F);
-//                                              currentColor = new Color(c.getRed(), c.getGreen(), c
-//                                                              .getBlue(), alpha).getRGB();
-//                                      }else if (currentPixel != ' ') {
-//                                              currentColor = main;
-//                                      }
-//                              }
-//                              bi.setRGB(i, row, currentColor);
-//                      }
-//                      row++;
-//              }
-//              _image = bi;
-//
-//              return true;
-//      }
-//
-//      @Override
-//      protected Picture createPicture() {
-//              return new FrameBitmap(this.getSource(), _imageObserver, _image);
-//      }
-//
-//      @Override
-//      protected String getTagText() {
-//              return "@b: ";
-//      }
+        @Override
+        public boolean refresh() {
+                assert (_source.getLink() != null);
+                Frame frame = FrameIO.LoadFrame(_source.getAbsoluteLink());
+                // if the frame cant be found just use the current image
+                if (frame == null) {
+                        return false;
+                }
+
+                List<Text> textList = frame.getBodyTextItems(false);
+                if (textList.size() == 0)
+                        return false;
+                List<String> imageLines = textList.get(0).getTextList();
+                int width = 0;
+                int height = imageLines.size();
+                // Determine the image width by finding the widest line of text
+                for (String s : imageLines) {
+                        if (s.length() > width)
+                                width = s.length();
+                }
+                
+                if(width == 0)
+                        return false;
+                
+                BufferedImage bi = new BufferedImage(width, height,
+                                BufferedImage.TYPE_INT_ARGB);
+                // now set the bits on the image
+                final int transparent = (new Color(0F, 0F, 0F, 0F)).getRGB();
+                final int main = _source.getPaintColor().getRGB();
+                final Color c = _source.getPaintColor();
+                int currentColor = main;
+                int row = 0;
+                for (String s : imageLines) {
+                        for (int i = 0; i < width; i++) {
+                                currentColor = transparent;
+                                if (i < s.length()) {
+                                        char currentPixel = s.charAt(i);
+                                        // Space is transparent as is 0
+                                        if (Character.isDigit(currentPixel)) {
+                                                int alpha = Math.round((currentPixel - '0') * 25.5F);
+                                                currentColor = new Color(c.getRed(), c.getGreen(), c
+                                                                .getBlue(), alpha).getRGB();
+                                        }else if (currentPixel != ' ') {
+                                                currentColor = main;
+                                        }
+                                }
+                                bi.setRGB(i, row, currentColor);
+                        }
+                        row++;
+                }
+                _image = bi;
+
+                return true;
+        }
+
+        @Override
+        protected Picture createPicture() {
+                return new FrameBitmap((Text) _source.copy(),
+                                _imageObserver, _image);
+        }
+
+        @Override
+        protected String getTagText() {
+                return "@b: ";
+        }
 }

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

@@ -1 +1 @@
 package org.expeditee.items;
 
+import java.awt.Image;
 import java.awt.image.ImageObserver;
 
-//TODO: Make this work with new Picture class
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameIO;
 
 public class FrameImage extends FramePicture {
+        /**
+         * Creates a new Picture from the given path. The ImageObserver is optional
+         * and can be set to NULL. <br>
+         * Note: It is assumed that the file described in path has already been
+         * checked to exist.
+         * 
+         * @param source
+         *            The Text Item that was used to create this Picture
+         * @param path
+         *            The Path of the Image to load from disk.
+         * @param observer
+         *            The ImageObserver to assign when painting the Image on the
+         *            screen.
+         */
+        public FrameImage(Text source, ImageObserver observer, Image image) {
+                super(source, observer, image);
+        }
 
-        protected FrameImage(String path, ImageObserver observer) {
-            super(path, observer);
-    }
-//      /**
-//       * Creates a new Picture from the given path. The ImageObserver is optional
-//       * and can be set to NULL. <br>
-//       * Note: It is assumed that the file described in path has already been
-//       * checked to exist.
-//       * 
-//       * @param source
-//       *            The Text Item that was used to create this Picture
-//       * @param path
-//       *            The Path of the Image to load from disk.
-//       * @param observer
-//       *            The ImageObserver to assign when painting the Image on the
-//       *            screen.
-//       */
-//      public FrameImage(Text source, ImageObserver observer, Image image) {
-//              super(source, observer, image);
-//      }
-//
-//      @Override
-//      protected Picture createPicture() {
-//              return new FrameImage(this.getSource(), _imageObserver, _image);
-//      }
-//
-//      @Override
-//      public boolean refresh() {
-//              // Need to parse the first time the frame is being displayed
-//              // parseSize();
-//              assert (getLink() != null);
-//              Frame frame = FrameIO.LoadFrame(getAbsoluteLink(), null, true);
-//              if (frame == null)
-//                      return false;
-//
-//              frame.setBuffer(null);
-//              FrameGraphics.UpdateBuffer(frame, false, false);
-//              _image = frame.getBuffer();
-//
-//              // TODO tidy this up, need to call parse size only when the frame has
-//              // been created to begin with
-//              // parseSize();
-//              updatePolygon();
-//              return true;
-//      }
-//
-//      @Override
-//      protected String getTagText() {
-//              return "@f: ";
-//      }
+        @Override
+        protected Picture createPicture() {
+                return new FrameImage(_source.copy(), _imageObserver, _image);
+        }
+
+        @Override
+        public boolean refresh() {
+                // Need to parse the first time the frame is being displayed
+                // parseSize();
+                assert (_source.getLink() != null);
+                Frame frame = FrameIO.LoadFrame(_source.getAbsoluteLink(), null, true);
+                if (frame == null)
+                        return false;
+
+                frame.setBuffer(null);
+                FrameGraphics.UpdateBuffer(frame, false, false);
+                _image = frame.getBuffer();
+
+                // TODO tidy this up, need to call parse size only when the frame has
+                // been created to begin with
+                parseSize();
+                updatePolygon();
+                return true;
+        }
+
+        @Override
+        protected String getTagText() {
+                return "@f: ";
+        }
 }

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

@@ -1 +1 @@
 package org.expeditee.items;
 
+import java.awt.Color;
+import java.awt.Image;
 import java.awt.image.ImageObserver;
 
-//TODO: Make this work with new Picture class
+import org.expeditee.gui.AttributeValuePair;
+import org.expeditee.gui.Frame;
 
 public abstract class FramePicture extends Picture {
-        protected FramePicture(String path, ImageObserver observer) {
-                super(path, observer);
+        protected FramePicture(Text source, ImageObserver observer, Image image) {
+                super(source, observer, image);
         }
 
-//      @Override
-//      public void setColor(Color c) {
-//              super.setColor(c);
-//              refresh();
-//      }
-//      
-//      @Override
-//      public void setLink(String frameName) {
-//              setLink(frameName);
-//              //remove the picture if the link is being removed
-//              if (getLink() == null) {
-//                      Frame parent = getParent();
-//                      if (parent != null) {
-//                              parent.removeItem(this);
-//                              setHidden(false);
-//                      }
-//              } else {
-//                      refresh();
-//              }
-//              updatePolygon();
-//      }
-//      
-//      @Override
-//      public String getName() {
-//              return getAbsoluteLink();
-//      }
-//      
-//      @Override
-//      protected String getImageSize() {
-//              return new AttributeValuePair(_source.getText()).getValue();
-//      }
+        @Override
+        public void setColor(Color c) {
+                super.setColor(c);
+                refresh();
+        }
+        
+        @Override
+        public void setLink(String frameName) {
+                if (_source == null)
+                        return;
+                else {
+                        _source.setLink(frameName);
+                        //remove the picture if the link is being removed
+                        if (_source.getLink() == null) {
+                                Frame parent = getParent();
+                                if (parent != null) {
+                                        parent.removeItem(this);
+                                        _source.setHidden(false);
+                                        _source.removeEnclosure(this);
+                                }
+                        } else {
+                                refresh();
+                        }
+                }
+                updatePolygon();
+        }
+        
+        @Override
+        public String getName() {
+                return _source.getAbsoluteLink();
+        }
+        
+        @Override
+        protected String getImageSize() {
+                return new AttributeValuePair(_source.getText()).getValue();
+        }
 }

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

@@ -338 +338 @@
          * If the Image file cannot be found on disk null is returned.
          * 
-         * @param path
-         *            The path to the image file
+         * @param source
+         *            The Text file containing the Picture infomation
          * @return The Picture object representing the file, or Null if the file is
          *         not found.
@@ -346 +346 @@
                 String text = source.getText();
                 String path = "";
+                String fileName = "";
                 String size = "";
-                String crop = "";
 
                 try {
@@ -366 +366 @@
                                 size = text.substring(endOfFileName).trim();
                         }
+                        fileName = path;
+
+                        // try images subdirectory
+                        File file = null;
+
+                        for (String dir : org.expeditee.settings.UserSettings.ImageDirs) {
+                                file = new File(dir + path);
+                                if (file.exists() && !file.isDirectory())
+                                        break;
+                        }
+
+                        if (file == null || !file.exists() || file.isDirectory())
+                                file = new File(path);
+
+                        // try relative path
+                        if (!file.exists() || file.isDirectory()) {
+                                URL picture = new Object().getClass().getResource(path);
+
+                                // decode to remove %20 in windows folder names
+                                if (picture != null) {
+                                        try {
+                                                path = URLDecoder.decode(picture.getFile(), "UTF-8");
+                                        } catch (UnsupportedEncodingException e) {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }
+                                }
+
+                        } else
+                                path = file.getPath();
+
+                        // if the image isn't found by now, give up.
+                        file = new File(path);
+                        if (!file.exists() || file.isDirectory()) {
+                                return null;
+                        }
 
                 } catch (Exception e) {
@@ -372 +408 @@
 
                 try {
-                        Picture pic = new Picture(path, source, size, observer);
+                        Picture pic = new Picture(source, fileName, path, size, observer);
+
                         return pic;
                 } catch (Exception e) {

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

@@ -17 +17 @@
 import java.awt.image.ImageObserver;
 import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
+import java.io.IOException;
+import java.text.DecimalFormat;
 
 import javax.imageio.ImageIO;
@@ -26 +25 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.settings.UserSettings;
+import org.expeditee.stats.Logger;
 
 /**
@@ -45 +44 @@
  * 
  */
-public class Picture extends Item {
-        
-        protected static final Image imageNotFound;
-        protected static final Polygon imageNotFoundPolygon;
-        static {
-                Image iNF = null;
-                try {
-                        URL image = ClassLoader.getSystemResource("org/expeditee/resources/images/imageNotFound.png");
-                        if(image != null) {
-                                iNF = Toolkit.getDefaultToolkit().getImage(image);
-                        } else {
-                                System.err.println("Failed to load default image");
-                        }
-                } catch(Exception e) {
-                        e.printStackTrace();
-                }
-                imageNotFound = iNF;
-                imageNotFoundPolygon = new Polygon();
-                imageNotFoundPolygon.addPoint(-1,  -1);
-                imageNotFoundPolygon.addPoint(65, -1);
-                imageNotFoundPolygon.addPoint(65,  65);
-                imageNotFoundPolygon.addPoint(-1, 65);
-                imageNotFoundPolygon.addPoint(-1,  65);
-                System.out.println("Loaded static members");
-        }
+public class Picture extends XRayable {
 
         private static final int MINIMUM_WIDTH = 10;
+
         public static final int WIDTH = 0;
+
         public static final int RATIO = 1;
 
         protected Image _image = null;
-        protected Image _croppedImage = null;
 
         private int _scaleType = RATIO;
@@ -82 +58 @@
         private float _scale = 1.0f;
 
-        // Points relative to this Picture's cropping, for creating further cropped Pictures
+        // Start of the crop relative to START
         private Point _cropStart = null;
+
+        // Start of the crop relative to END
         private Point _cropEnd = null;
 
-        // Crop data of this Picture
         private Point _start = new Point(0, 0);
+
         private Point _end = new Point(0, 0);
 
@@ -93 +71 @@
 
         private String _path = "";
+
+        private String _size = "";
+
+        private String _fileName = null;
 
         // used to repaint animated GIF images, among other things.
         protected ImageObserver _imageObserver = null;
+
+        protected Picture(Text source, ImageObserver observer, Image image) {
+                super(source);
+                _imageObserver = observer;
+                _image = image;
+
+                refresh();
+
+                if (_image != null)
+                        parseSize();
+        }
 
         /**
@@ -103 +96 @@
          * checked to exist.
          * 
+         * @param source
+         *            The Text Item that was used to create this Picture
+         * @param fileName
+         *            the name of the file as it should be displayed in the source
+         *            text
          * @param path
          *            The Path of the Image to load from disk.
@@ -109 +107 @@
          *            screen.
          */
-        
-        public Picture(int id) {
-                super();
-                setID(id);
-        }
-        
-        public Picture(String path, ImageObserver observer, int id) {
-                super();
-                if(id == -1) {
-                        id = this.getParentOrCurrentFrame().getNextItemID();
-                }
-                setID(id);
+        public Picture(Text source, String fileName, String path, String size,
+                        ImageObserver observer) {
+                super(source);
                 _imageObserver = observer;
-                this.setImageSource(path);
-        }
-        
-        public Picture(String path, ImageObserver observer) {
-                this(path, observer, -1);
-        }
-        
-        public Picture(String path, Text source, String size, ImageObserver observer) {
-                this(path, observer, source.getID());
-                Item.DuplicateItem(source, this);
-                this.parseSize(size);
-                updatePolygon();
-        }
-        
-        /**
-         * Parse string input given in an @i tag
-         */
-        protected void parseSize(String size) {
-                // don't check this anymore since it's only called from constructors now
-                // if (_end.x != 0 || _end.y != 0)
-                //      return;
+                _fileName = fileName;
+                _path = path;
+                _size = size;
+
+                refresh();
+                parseSize();
+        }
+
+        protected String getImageSize() {
+                return _size;
+        }
+
+        protected void parseSize() {
+                String size = getImageSize();
+
+                if (_end.x != 0 || _end.y != 0)
+                        return;
 
                 // set the default values for start and end
@@ -170 +155 @@
                         if (size.length() == 0) {
                                 size = "" + _image.getWidth(null);
+                                _source.setText(getTagText() + size);
                                 return;
                         }
@@ -189 +175 @@
         }
 
-
-        /**
-         * Set the start point for generating a new cropped Picture from this Picture
-         */
         public void setStartCrop(int x, int y) {
                 invalidateCroppedArea();
@@ -199 +181 @@
         }
 
-        /**
-         * Set the end point for generating a new cropped Picture from this Picture
-         */
         public void setEndCrop(int x, int y) {
                 invalidateCroppedArea();
@@ -223 +202 @@
         }
 
-        /**
-         * Get the top left point (_start) for generating a new cropped Picture from this Picture
-         */
         public Point getTopLeftCrop() {
                 return new Point(Math.min(_cropStart.x, _cropEnd.x), Math.min(
@@ -231 +207 @@
         }
 
-        /**
-         * Get the bottom right point (_end) for generating a new cropped Picture from this Picture
-         */
         public Point getBottomRightCrop() {
                 return new Point(Math.max(_cropStart.x, _cropEnd.x), Math.max(
@@ -246 +219 @@
 
         public boolean isCropTooSmall() {
-                if (_cropStart == null || _cropEnd == null || _image == imageNotFound)
+                if (_cropStart == null || _cropEnd == null)
                         return true;
 
@@ -261 +234 @@
                 setShowCrop(false);
         }
-        
-        public int getStartX() {
-                return _image == imageNotFound ? 0 : _start.x;
-        }
-        
-        public int getStartY() {
-                return _image == imageNotFound ? 0 : _start.y;
-        }
-        
-        public int getEndX() {
-                return _image == imageNotFound ? 64 : _end.x == 0 ? _image.getWidth(null) : _end.x;
-        }
-        
-        public int getEndY() {
-                return _image == imageNotFound ? 64 : _end.y == 0 ? _image.getHeight(null) : _end.y;
-        }
 
         public void updatePolygon() {
                 if (_image == null) {
                         refresh();
-                }
-                if (_image == imageNotFound) {
-                        _poly = new Polygon(imageNotFoundPolygon.xpoints, imageNotFoundPolygon.ypoints, imageNotFoundPolygon.npoints);
-                        _poly.translate(getX(), getY());
-                        // _start = new Point(0, 0);
-                        // _end = new Point(_image.getWidth(null), _image.getHeight(null));
-                        // _scale = 1f;
-                        return;
-                }
-                
+                        parseSize();
+                }
                 _poly = new Polygon();
 
@@ -300 +249 @@
 
                         // extra pixel around the image so the highlighting is visible
-                        _poly.addPoint(getX() + 1 + xdiff, getY() - 1);
-                        _poly.addPoint(getX() + width, getY() - 1);
-                        _poly.addPoint(getX() + width, getY() + height);
-                        _poly.addPoint(getX() + 1 + xdiff, getY() + height);
+                        _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() - 1);
+                        _poly.addPoint(_source.getX() + width, _source.getY() - 1);
+                        _poly.addPoint(_source.getX() + width, _source.getY() + height);
+                        _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() + height);
                 } else {
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        Rectangle clip = new Rectangle(topLeft.x + getX(),
-                                        topLeft.y + getY(), bottomRight.x - topLeft.x,
+                        Rectangle clip = new Rectangle(topLeft.x + _source.getX(),
+                                        topLeft.y + _source.getY(), bottomRight.x - topLeft.x,
                                         bottomRight.y - topLeft.y).getBounds();
                         _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
@@ -325 +274 @@
         @Override
         public void setWidth(Integer width) {
-                _scaleType = WIDTH;
-                _scale = width * 1F / (getUnscaledWidth());
+                _scale = width * 1F / (_end.x - _start.x);
         }
 
@@ -342 +290 @@
         @Override
         public Integer getWidth() {
-                return Math.round((getUnscaledWidth()) * _scale);
+                return Math.round((_end.x - _start.x) * _scale);
         }
 
@@ -350 +298 @@
         @Override
         public int getHeight() {
-                return Math.round((getUnscaledHeight()) * _scale);
+                return Math.round((_end.y - _start.y) * _scale);
         }
 
@@ -365 +313 @@
         @Override
         public void paint(Graphics2D g) {
-                // System.out.println("drawing image");
-
-                if(_image == null) {
+                if (_image == null)
                         return;
-                }
-                
-                int width = _image == imageNotFound ? 64 : getWidth();
-                int height = _image == imageNotFound ? 64 : getHeight();
-                int startX = getStartX();
-                int startY = getStartY();
-                int endX = getEndX();
-                int endY = getEndY();
-                
-                // System.out.println(width + " : " + height);
+
+                int width = getWidth();
+                int height = getHeight();
 
                 paintLink(g);
 
-                int dX1 = getX();
-                int dY1 = getY();
-                int dX2 = getX() + width;
-                int dY2 = getY() + height;
+                int dX1 = _source.getX();
+                int dY1 = _source.getY();
+                int dX2 = _source.getX() + width;
+                int dY2 = _source.getY() + height;
 
                 // if we are showing the cropping, then show the original as transparent
@@ -393 +332 @@
                         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
                                         alpha));
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, startX, startY, endX, endY, _imageObserver);
+                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
+                                        _end.y, _imageObserver);
 
                         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
@@ -406 +346 @@
                         g.setClip(clip);
 
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, startX, startY, endX, endY, _imageObserver);
+                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
+                                        _end.y, _imageObserver);
                         g.draw(clip);
                         // if the image is cropped, but we are not showing the cropping
                         // otherwise, paint normally
                 } else {
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, startX, startY, endX, endY, _imageObserver);
+                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
+                                        _end.y, _imageObserver);
                 }
 
@@ -446 +388 @@
 
         protected Picture createPicture() {
-                return new Picture(_path, _imageObserver);
-                // return ItemUtils.CreatePicture((Text) _source.copy(), _imageObserver);
+                return ItemUtils.CreatePicture((Text) _source.copy(), _imageObserver);
         }
 
@@ -455 +396 @@
                 p._image = _image;
                 p._mode = _mode;
-                p.setPosition(getPosition());
                 // Doing Duplicate item duplicates link mark which we dont want to do
                 // when in audience mode because the linkMark will be copied incorrectly
@@ -466 +406 @@
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        int startX = Math.round(topLeft.x / _scale) + getStartX();
-                        int startY = Math.round(topLeft.y / _scale) + getStartY();
-                        int endX = Math.round(bottomRight.x / _scale + getStartX());
-                        int endY = Math.round(bottomRight.y / _scale + getStartY());
+                        int startX = Math.round(topLeft.x / _scale) + _start.x;
+                        int startY = Math.round(topLeft.y / _scale) + _start.y;
+                        int endX = Math.round(bottomRight.x / _scale + _start.x);
+                        int endY = Math.round(bottomRight.y / _scale + _start.y);
                         int width = _image.getWidth(null);
                         int height = _image.getHeight(null);
@@ -488 +428 @@
                         p._start = new Point(startX, startY);
                         p._end = new Point(endX, endY);
-                        p.setPosition(topLeft.x + getX(), topLeft.y + getY());
+                        p._source.setPosition(topLeft.x + _source.getX(), topLeft.y
+                                        + _source.getY());
                 } else {
                         p._start = _start;
@@ -496 +437 @@
                 p._scaleType = _scaleType;
                 p._path = _path;
-
+                p._fileName = _fileName;
+
+                p.updateSource();
                 p.updatePolygon();
 
@@ -507 +450 @@
 
         public void setScale(float scale) {
-                _scaleType = RATIO;
                 _scale = scale;
         }
@@ -513 +455 @@
         @Override
         public float getSize() {
-                // to let scaling work
-                return UserSettings.ItemTemplate.getSize();
+                return _source.getSize();
         }
 
         @Override
         public void setSize(float size) {
-                float diff = size - getSize();
+                float diff = size - _source.getSize();
                 float oldScale = _scale;
 
@@ -529 +470 @@
                         _scale = oldScale;
                 } else {
-                        this.translate(new Point2D.Float(FrameMouseActions.MouseX,
+                        _source.translate(new Point2D.Float(FrameMouseActions.MouseX,
                                         FrameMouseActions.MouseY), multiplier);
                 }
+                updateSource();
                 updatePolygon();
                 // Make sure items that are resized display the border
@@ -560 +502 @@
                 return Toolkit.getDefaultToolkit().createImage(
                                 new FilteredImageSource(_image.getSource(),
-                                                new CropImageFilter(getStartX(), getStartY(),
+                                                new CropImageFilter(_start.x, _start.y,
                                                                 getUnscaledWidth(), getUnscaledHeight())));
         }
 
         public int getUnscaledWidth() {
-                return getEndX() - getStartX();
+                return _end.x - _start.x;
         }
 
         public int getUnscaledHeight() {
-                return getEndY() - getStartY();
+                return _end.y - _start.y;
         }
 
@@ -576 +518 @@
          */
         public boolean isCropped() {
-                return (_start.x > 0 || _start.y > 0 || (_end.x > 0 && _end.x < _image.getWidth(null)) || (_end.y > 0 && _end.y < _image.getHeight(null)));
-                // return _end.x != 0 || _end.y != 0 || _end.x != _image.getWidth(null) || _end.y != _image.getHeight(null) || _start.y != 0 || _start.x != 0;
-        }
-
+                return _end.x != 0 || _end.y != 0 || _start.y != 0 || _start.x != 0;
+        }
+
+        @Override
         public boolean refresh() {
-                // try images subdirectory
-                File file = null;
-
-                for (String dir : org.expeditee.settings.UserSettings.ImageDirs) {
-                        file = new File(dir + _path);
-                        if (file.exists() && !file.isDirectory())
-                                break;
-                }
-
-                if (file == null || !file.exists() || file.isDirectory())
-                        file = new File(_path);
-
-                // try relative path
-                if (!file.exists() || file.isDirectory()) {
-                        URL picture = new Object().getClass().getResource(_path);
-
-                        // decode to remove %20 in windows folder names
-                        if (picture != null) {
-                                try {
-                                        _path = URLDecoder.decode(picture.getFile(), "UTF-8");
-                                } catch (UnsupportedEncodingException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
-                                }
-                        }
-
-                } else
-                        _path = file.getPath();
-
-                // if the image isn't found by now, give up.
-                file = new File(_path);
-                if (!file.exists() || file.isDirectory()) {
-                        // If the image could not be read
-                        _image = imageNotFound;
-                        return false;
-                }
-
                 // ImageIcon is faster, but cannot handle some formats
                 // (notably.bmp) hence, we try this first, then if it fails we try
@@ -630 +535 @@
                         try {
                                 _image = ImageIO.read(new File(_path));
-                        } catch (Exception e) {
+                        } catch (IOException e) {
                                 // e.printStackTrace();
-                                // Logger.Log(e);
-                                
-                                // If the image could not be read
-                                _image = imageNotFound;
+                                Logger.Log(e);
+                                _image = null;
                                 return false;
                         }
@@ -653 +556 @@
                 // if(!state)
                 // invalidateCommonTrait(ItemAppearence.LinkChanged);
-                super.setLinkMark(state);
+                _source.setLinkMark(state);
                 // if(state)
                 // invalidateCommonTrait(ItemAppearence.LinkChanged);
@@ -663 +566 @@
                 // if (!state)
                 // invalidateCommonTrait(ItemAppearence.LinkChanged);
-                super.setActionMark(state);
+                _source.setActionMark(state);
                 // if (state)
                 // invalidateCommonTrait(ItemAppearence.LinkChanged);
@@ -670 +573 @@
 
         @Override
+        public boolean getLinkMark() {
+                return !FrameGraphics.isAudienceMode() && _source.getLinkMark();
+        }
+
+        @Override
+        public boolean getActionMark() {
+                return _source.getActionMark();
+        }
+
+        @Override
         public String getName() {
-                return _path;
+                return _fileName;
+        }
+
+        protected String getTagText() {
+                return "@i: " + _fileName + " ";
+        }
+
+        /**
+         * Updates the source text for this item to match the current size of the
+         * image.
+         * 
+         */
+        private void updateSource() {
+                StringBuffer newText = new StringBuffer(getTagText());
+
+                switch (_scaleType) {
+                case (RATIO):
+                        DecimalFormat format = new DecimalFormat("0.00");
+                        newText.append(format.format(_scale));
+                        break;
+                case (WIDTH):
+                        newText.append(getWidth());
+                        break;
+                }
+
+                // If the image is cropped add the position for the start and finish of
+                // the crop to the soure text
+                if (_start.x > 0 || _start.y > 0 || _end.x < _image.getWidth(null)
+                                || _end.y < _image.getHeight(null)) {
+                        newText.append(" ").append(_start.x).append(" ").append(_start.y);
+                        newText.append(" ").append(_end.x).append(" ").append(_end.y);
+                }
+
+                _source.setText(newText.toString());
         }
 
@@ -677 +623 @@
         public void translate(Point2D origin, double ratio) {
                 _scale *= ratio;
+                updateSource();
                 super.translate(origin, ratio);
         }
@@ -699 +646 @@
 
         }
-        
-        public Item merge(Item merger, int mouseX, int mouseY) {
-                return merger;
-        }
 
         @Override
@@ -709 +652 @@
                 super.scale(scale, originX, originY);
         }
-        
-        public Integer getWidthToSave() {
-                if(_scaleType == WIDTH) {
-                        return this.getWidth();
-                }
-                return null;
-        }
-        
-        public Float getScaleToSave() {
-                if(_scaleType == RATIO) {
-                        return this.getScale();
-                }
-                return null;
-        }
-        
-        public Point getCropStart() {
-                if (isCropped()) {
-                        return _start;
-                }
-                return null;
-        }
-        
-        public Point getCropEnd() {
-                if (isCropped()) {
-                        return _end;
-                }
-                return null;
-        }
-        
-        public void setCropStart(Point cropStart) {
-                invalidateCroppedArea();
-                this._start = cropStart;
-                updatePolygon();
-                invalidateAll();
-        }
-        
-        public void setCropEnd(Point cropEnd) {
-                invalidateCroppedArea();
-                this._end = cropEnd;
-                updatePolygon();
-                invalidateAll();
-        }
-        
-        public String getImageSource() {
-                return _path;
-        }
-        
-        public void setImageSource(String path) {
-                if(_path == path) {
-                        return;
-                }
-                // update image
-                invalidateAll();
-                _path = path;
-                refresh();
-                updatePolygon();
-                invalidateAll();
-        }
-        
-        
-        protected String getTagText() {
-                return "@i: ";
-        }
-        
-        private String getCrop() {
-                Point start = getCropStart();
-                Point end = getCropEnd();
-                if(start == null || end == null) {
-                        return "";
-                }
-                return " " + start.x + " " + start.y + " " + end.x + " " + end.y;
-        }
-        
-        // generate a fake source item to let old code work
-        public Text getSource() {
-                Text source = new Text(getID());
-                Item.DuplicateItem(this, source);
-                source.setText(this.getTagText() + this.getImageSource() + " " + this.getWidthToSave() + getCrop());
-                return source;
-        }
-        
-        public String toString() {
-                return "[Image] '" + getImageSource() + "' on frame " + this.getParent().getName() + " at " + getPosition().toString();
-        }
 
 }