Changeset 1232 for trunk

Timestamp:

02/04/19 13:54:46 (5 years ago)

Author:

bln4

Message:

Amendment to previous commit.

org.expeditee.gui.Frame ->
org.expeditee.gui.FrameIO ->

When loading a frame and deciding if the cache should be used, the file system is now consulted to check if there is a more recent version available. If there is then the cache is not used. This is useful for collaborative frame authoring when access to frame is controlled via a system such as google drive.

New stuffs.
org.expeditee.gui.FrameIO ->
org.expeditee.io.DefaultFrameReader ->
org.expeditee.io.ExpReader ->

When saving a frame, if there is a newer version (than what is cached) on the file system, then treat that a version collision (creates a new frame with your edits on it so that it can be manually resolved)

Location:

trunk/src/org/expeditee

Files:

• gui/FrameIO.java (modified) (3 diffs)
• io/DefaultFrameReader.java (modified) (2 diffs)
• io/ExpReader.java (modified) (1 diff)

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

@@ -961 +961 @@
         public static String SaveFrame(Frame toSave, boolean inc,
                         boolean checkBackup) {
-                
-                if (toSave.getName().startsWith("ExpediteeMail")) {
-                        System.err.println();
-                }
 
                 // TODO When loading a frame maybe append onto the event history too-
-                // with a
-                // break to indicate the end of a session
+                // with a break to indicate the end of a session
 
                 if (toSave == null || !toSave.hasChanged() || toSave.isSaved()) {
@@ -1031 +1026 @@
                                 savedVersion = KMSReader.getVersion(fullPath);
                         }
-
+                        
                         // Check if the frame doesnt exist
                         // if (savedVersion < 0) {
@@ -1047 +1042 @@
                         // Check if we are trying to save an out of date version
                         String framesetName = toSave.getFramesetName();
+                        long frameLastModify = toSave.getLastModifyPrecise();
+                        long fileLastModify = new File(fullPath).lastModified();
+                        boolean versionConflict = frameLastModify < fileLastModify;
                         boolean isBayFrameset = 
                                         framesetName.equalsIgnoreCase(MessageBay.MESSAGES_FRAMESET_NAME) || 
                                         framesetName.equalsIgnoreCase(MailBay.EXPEDITEE_MAIL_FRAMESET_NAME);
-                        if (savedVersion > toSave.getVersion() && !isBayFrameset) {
+                        if ((savedVersion > toSave.getVersion() || versionConflict) && !isBayFrameset) {
                                 // remove this frame from the cache if it is there
                                 // This will make sure links to the original are set correctly

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

@@ -20 +20 @@
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -178 +179 @@
         
         public Frame readFrame(String fullPath) throws IOException {
+                File f = new File(fullPath);
                 Reader in = new InputStreamReader(new FileInputStream(fullPath), "UTF-8");
-                return readFrame(new BufferedReader(in));
+                Frame frame = readFrame(new BufferedReader(in));
+                frame.setLastModifyDate(frame.getLastModifyDate(), f.lastModified());
+                return frame;
         }
 }

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

@@ -90 +90 @@
                 String next = "";
                 Frame newFrame = new Frame();
-
+                
                 try {
                         // Framename must be set before setting the frame number