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

Timestamp:

06/20/08 12:55:35 (16 years ago)

Author:

ra33

Message:

Made a whole lot of changes...

Including using polyLine etc for drawing rectangles nicer

File:

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

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

@@ -9 +9 @@
 import java.io.FileWriter;
 import java.io.IOException;
+import java.sql.Time;
 import java.util.HashMap;
 
@@ -629 +630 @@
          * 
          * @param toSave
-         *            The Frame to save to disk in KMS format.
+         *            The Frame to save to disk
          */
         public static String SaveFrame(Frame toSave) {
@@ -645 +646 @@
          * 
          * @param toSave
-         *            The Frame to save to disk in KMS format.
+         *            The Frame to save to disk
          * @param inc
          *            True if the saved frames counter should be incremented, false
@@ -655 +656 @@
                         boolean checkBackup) {
 
-                if (toSave == null)
+                // TODO When loading a frame maybe append onto the event history too- with a
+                // break to indicate the end of a session
+
+                if (toSave == null ||!toSave.hasChanged() || toSave.isSaved()){
+                        SessionStats.NewFrameSession();
                         return "";
-
-                if (!toSave.hasChanged() || toSave.isSaved())
-                        return "";
-
+                }
                 // Get the full path only to determine which format to use for saving
                 // the frame
@@ -672 +674 @@
                                 && toSave.getNameItem().Permission < Item.PERMISSION_TDFC) {
                         _Cache.remove(toSave.getName().toLowerCase());
+                        SessionStats.NewFrameSession();
                         return "";
                 }
@@ -694 +697 @@
                         }
                         // Check if we are trying to save an out of date version
-                        if (savedVersion > toSave.getVersion(false)
+                        if (savedVersion > toSave.getVersion()
                                         && !toSave.getFramesetName().equalsIgnoreCase(
                                                         FrameGraphics.MESSAGES_FRAMESET_NAME)) {
@@ -741 +744 @@
                                 ResumeCache();
                         }
-                        toSave.setActiveTime(SessionStats.getFrameActiveTime());
-                        toSave.setDarkTime(SessionStats.getFrameDarkTime());
+                        // Update general stuff about frame
                         toSave.setLastModifyDate(Logger.EasyDateFormat("ddMMMyyyy:HHmm"));
                         toSave.setLastModifyUser(UserSettings.Username);
+                        toSave.setVersion(toSave.getVersion() + 1);
+                        Time darkTime = new Time(SessionStats.getFrameDarkTime().getTime()
+                                        + toSave.getDarkTime().getTime());
+                        Time activeTime = new Time(SessionStats.getFrameActiveTime()
+                                        .getTime()
+                                        + toSave.getActiveTime().getTime());
+                        toSave.setDarkTime(darkTime);
+                        toSave.setActiveTime(activeTime);
+
                         writer.writeFrame(toSave);
                         toSave.setSaved();
-                        if (inc)
+                        if (inc) {
                                 SessionStats.SavedFrame(toSave.getName());
+                        }
 
                         // avoid out-of-sync frames (when in TwinFrames mode)