Changeset 585 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

12/08/13 17:22:36 (11 years ago)

Author:

jts21

Message:

New save format now can save and load frames on par with the exp format (see the testWriter action, I haven't tested writing to disk yet), working on making images their own Item (so they have real properties not an internal Text Item)

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (3 diffs)

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

@@ -7 +7 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -35 +37 @@
 import org.expeditee.gui.TimeKeeper;
 import org.expeditee.importer.FrameDNDTransferHandler;
+import org.expeditee.io.ExaReader;
+import org.expeditee.io.FrameWriter;
 import org.expeditee.io.JavaWriter;
 import org.expeditee.io.WebParser;
-import org.expeditee.io.Exp2Writer;
+import org.expeditee.io.ExaWriter;
 import org.expeditee.io.flowlayout.XGroupItem;
 import org.expeditee.items.Item;
@@ -1362 +1366 @@
         public static void testWriter(Frame frame) {
                 try {
-                new Exp2Writer().writeFrame(frame);
+                        FrameWriter fw = new ExaWriter();
+                        fw.writeFrame(frame);
+                        String contents = fw.getFileContents();
+                        System.out.println("*****\n" + contents + "*****");
+                        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.setPath(frame.getPath());
+                                Text text = frame.addText(100, 100, "new Frame", null);
+                                text.setLink(newFrame.getName());
+                                FrameIO.SaveFrame(newFrame);
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                        System.out.println("*****");
+
         } catch (Exception e) {
                 e.printStackTrace();