Changeset 589 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

12/09/13 14:42:44 (11 years ago)

Author:

jts21

Message:

EXA save format working + automatically converting save files to it's own format
Pictures are no longer XRayables, working fine except for a bug with cropping, and some problems with the default image that I need to fix.
FramePicture/FrameImage/FrameBitmap are disabled because they need to be changed to work with the modified Picture format but I don't know what they do so couldn't test them (will need to look into fixing that)

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (10 diffs)

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;
@@ -275 +277 @@
                         return null;
 
-                // check for the new file name format
+                // check for the exa file name format
                 String fullPath = source + Conversion.getFrameNumber(frameName)
+                                + ExaReader.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);
@@ -283 +293 @@
                         return fullPath;
 
-                // check for oldfile name format
+                // check for kms file name format
                 fullPath = source + Conversion.getFramesetName(frameName) + "."
                                 + Conversion.getFrameNumber(frameName);
@@ -354 +364 @@
                         FrameReader reader;
 
-                        if (fullPath.endsWith(ExpReader.EXTENTION)) {
+                        if(fullPath.endsWith(ExaReader.EXTENTION)) {
+                                reader = new ExaReader(frameName);
+                        } else if (fullPath.endsWith(ExpReader.EXTENTION)) {
                                 reader = new ExpReader(frameName);
                         } else {
@@ -817 +829 @@
                 // with a
                 // break to indicate the end of a session
+                
+                System.out.println(toSave.hasChanged());
+                System.out.println(toSave.isSaved());
 
                 if (toSave == null || !toSave.hasChanged() || toSave.isSaved()) {
@@ -860 +875 @@
                         checkBackup = false;
                 }
-
-                FrameWriter writer = null;
+                
+                FrameWriter writer = new ExaWriter();
                 int savedVersion;
+                boolean eraseOldFile;
+
                 try {
+                        
                         // if its a new frame or an existing Exp frame...
-                        if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {
-                                writer = new ExpWriter();
-                                savedVersion = ExpReader.getVersion(fullPath);
-                        } else {
-                                writer = new KMSWriter();
-                                savedVersion = KMSReader.getVersion(fullPath);
-                        }
+                if(fullPath == null || fullPath.endsWith(ExaReader.EXTENTION)) {
+                        savedVersion = ExaReader.getVersion(fullPath);
+                        eraseOldFile = 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
+                        eraseOldFile = true;
+                } else {
+                        // writer = new KMSWriter();
+                        savedVersion = KMSReader.getVersion(fullPath);
+                        // delete the old file since we're replacing it with exa format
+                        eraseOldFile = true;
+                }
 
                         // Check if the frame doesnt exist
@@ -959 +984 @@
                         // FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
                         writer.writeFrame(toSave);
+                        
+                        // Now that we've written the file, erase the old format file
+                        if(eraseOldFile && !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();
@@ -1492 +1524 @@
                 String filename = PUBLIC_PATH + Conversion.getFramesetName(frameName)
                                 + File.separator + Conversion.getFrameNumber(frameName)
-                                + ExpReader.EXTENTION;
+                                + ExaReader.EXTENTION;
 
                 File file = new File(filename);
@@ -1498 +1530 @@
                 if (file.exists()) {
                         // Check the versions
-                        int savedVersion = ExpReader.getVersion(filename);
+                        int savedVersion = ExaReader.getVersion(filename);
 
                         if (savedVersion > version) {
@@ -1516 +1548 @@
                                                 + nextNum;
                                 filename = PUBLIC_PATH + Conversion.getFramesetName(frameName)
-                                                + File.separator + nextNum + ExpReader.EXTENTION;
+                                                + File.separator + nextNum + ExaReader.EXTENTION;
 
                                 // Show the messages alerting the user