Changeset 286 for trunk/src/org/expeditee/io/DefaultFrameWriter.java

Timestamp:

08/29/08 08:17:54 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/io/DefaultFrameWriter.java (modified) (10 diffs)

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

@@ -6 +6 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 
@@ -12 +13 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.Item;
+import org.expeditee.items.Line;
 import org.expeditee.items.Text;
 
@@ -63 +65 @@
                         _ItemTags.put("G", Item.class
                                         .getMethod("getBackgroundColor", param));
-                        _ItemTags.put("K", Item.class
-                                        .getMethod("getBorderColor", param));
+                        _ItemTags.put("K", Item.class.getMethod("getBorderColor", param));
                         _ItemTags.put("H", Item.class.getMethod("getAnchorRight", param));
                         _ItemTags.put("I", Item.class.getMethod("getAnchorBottom", param));
@@ -83 +84 @@
                         _ItemTags.put("e", Item.class.getMethod("getFillColor", param));
                         _ItemTags.put("E", Item.class.getMethod("getGradientColor", param));
-                        
+
                         _ItemTags.put("i", Item.class.getMethod("getFillPattern", param));
                         _ItemTags.put("o", Item.class.getMethod("getOwner", param));
@@ -96 +97 @@
                         _ItemTags.put("t", Text.class.getMethod("getSpacing", param));
 
-                        //TODO set a boolean flag to indicate that the text is a formula
-                        //Store the formula in the text property NOT the answer
+                        // TODO set a boolean flag to indicate that the text is a formula
+                        // Store the formula in the text property NOT the answer
                         _ItemTags.put("J", Item.class.getMethod("getFormula", param));
                         _ItemTags.put("T", Text.class.getMethod("getText", param));
@@ -138 +139 @@
         /**
          * Called before writing out the body items of each frame.
-         * @param starting the name of the frame currently being written out.
+         * 
+         * @param starting
+         *            the name of the frame currently being written out.
          * @throws IOException
          */
@@ -152 +155 @@
         /**
          * Called after writing out the body items of each frame.
-         * @param ending the name of the frame currently being written out.
+         * 
+         * @param ending
+         *            the name of the frame currently being written out.
          * @throws IOException
          */
@@ -160 +165 @@
         protected void initialise(Frame start) throws IOException {
                 if (_filename == null)
-                        _filename = FrameIO.EXPORTS_DIR + getValidFilename(start.getTitle()) + _format;
+                        _filename = FrameIO.EXPORTS_DIR
+                                        + getFileName(start) + _format;
 
                 if (_filename.equalsIgnoreCase(WriteTree.CLIPBOARD)) {
@@ -189 +195 @@
         }
 
+        protected String getFileName(Frame start) {
+                return getValidFilename(start.getTitle());
+        }
+
         public static String getValidFilename(String filename) {
                 return filename.replaceAll("[ \\.]", "_");
@@ -212 +222 @@
                 writeStartFrame(toWrite);
 
+                Collection<Item> done = new HashSet<Item>();
+
                 for (Item i : getItemsToWrite(toWrite)) {
-                        if (_stop){
+                        if (_stop) {
                                 return;
                         }
+
+                        if (i instanceof Line) {
+                                if (done.contains(i)) {
+                                        continue;
+                                }
+                                done.addAll(i.getAllConnected());
+                        }
                         writeItem(i);
                 }
-
                 writeEndFrame(toWrite);
         }
-        
+
         protected Collection<Item> getItemsToWrite(Frame toWrite) {
                 return toWrite.getItemsToSave();