Changeset 593 for trunk/src/org/expeditee/gui/AttributeUtils.java

Timestamp:

12/09/13 17:37:35 (11 years ago)

Author:

jts21

Message:

Fix divide-by-zero error in Image loading, fix Frame attribute saving (was using the wrong list), add indentation to Item properties for readability of the save file, add insert method to AttributeSet to deal with cases where an attribute must be loaded before another attribute from another section

File:

• trunk/src/org/expeditee/gui/AttributeUtils.java (modified) (4 diffs)

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

@@ -52 +52 @@
                 public final List<String> keys = new LinkedList<String>();
                 
+                // put an item at the end of the list
                 public void put(String attributeName, Method getter, Method setter) {
                         if(map.containsKey(attributeName.toLowerCase())) {
@@ -59 +60 @@
                                 keys.add(attributeName.toLowerCase());
                         }
+                        map.put(attributeName.toLowerCase(), new Attribute(attributeName, getter, setter));
+                }
+                
+                // 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));
                 }
@@ -219 +231 @@
                         // FrameAttribSave has some extra stuff
                         _FrameAttribSave.putAll(_FrameAttrib);
-                        _FrameAttribSave.put("Version",     Frame.class.getMethod("getVersion"),
+                        _FrameAttribSave.ins("Version",Frame.class.getMethod("getVersion"),
                                                             Frame.class.getMethod("setVersion", pInt));
                         _FrameAttribSave.put("FrozenDate",  Frame.class.getMethod("getFrozenDate"),
@@ -307 +319 @@
                         
                         // Picture Items
-                        _Attrib.put("Image",                Picture.class.getMethod("getImageSource"),
+                        _Attrib.ins("Image",                Picture.class.getMethod("getImageSource"),
                                                             Picture.class.getMethod("setImageSource", pString));
                         _Attrib.put("Scale",                Picture.class.getMethod("getScaleToSave"),