Changeset 1229 for trunk

Timestamp:

02/04/19 10:54:41 (5 years ago)

Author:

bln4

Message:

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.

Location:

trunk/src/org/expeditee/gui

Files:

• Frame.java (modified) (4 diffs)
• FrameIO.java (modified) (3 diffs)

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

@@ -101 +101 @@
 
         private String _modifiedDate = null;
+        private long _modifiedDatePrecise;
 
         private String _frozenDate = null;
@@ -803 +804 @@
          * @param date
          *            The date to set as the last modified date.
-         */
-        public void setLastModifyDate(String date)
-        {
+         * @param precise The millisecond precision last modified date.
+         */
+        public void setLastModifyDate(String date, long precise) {
                 _modifiedDate = date;
+                _modifiedDatePrecise = precise;
+        }
+        
+        /**
+         * Sets the last modified date of this Frame to the given String.
+         * Used during startup.  If able to be more precise then use the overloaded function.
+         * 
+         * @param date
+         *            The date to set as the last modified date.
+         */
+        public void setLastModifyDate(String date) {
+                _modifiedDate = date;
+                _modifiedDatePrecise = -1l;
         }
 
@@ -815 +829 @@
          *            The date to set as the last frozen date.
          */
-        public void setFrozenDate(String date)
-        {
+        public void setFrozenDate(String date)  {
                 _frozenDate = date;
         }
@@ -1198 +1211 @@
         }
 
-        public String getLastModifyDate()
-        {
+        public String getLastModifyDate() {
                 return _modifiedDate;
+        }
+        
+        public long getLastModifyPrecise() {
+                return _modifiedDatePrecise;
         }
 

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

@@ -220 +220 @@
                         Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName + " from cache.");
                         Frame frame = _Cache.get(frameNameLower);
-                        return frame;
+                        
+                        // if frame is cache is older than the one on disk then don't use the cached one
+                        String p = frame.getPath() + frame.getNumber() + ".exp";
+                        File file = new File(p);
+                        if (file.lastModified() <= frame.getLastModifyPrecise()) {
+                                return frame;
+                        }
                 }
 
@@ -230 +236 @@
 
         //Loads the 'restore' version of a frame if there is one
-                public static Frame LoadRestoreFrame(Frame frameToRestore) {                    
+        public static Frame LoadRestoreFrame(Frame frameToRestore) {                    
                         
-                        String fullPath = getFrameFullPathName(frameToRestore.getPath(), frameToRestore
-                                        .getName());
-                        //System.out.println("fullpath: " + fullPath);
-                        String restoreVersion = fullPath + ".restore";
-                        //System.out.println("restoreversion" + restoreVersion);
-                        File source = new File(restoreVersion);
-                        File dest = new File(fullPath);
-                        
-                        FileChannel inputChannel = null;
-                        FileChannel outputChannel = null;
-                        
-                        try{
-                                        FileInputStream source_fis = new FileInputStream(source);
-                                        inputChannel = source_fis.getChannel();
-                                        
-                                        FileOutputStream dest_fos = new FileOutputStream(dest);
-                                        outputChannel = dest_fos.getChannel();
-                                        
-                                        outputChannel.transferFrom(inputChannel, 0, inputChannel.size());
-                                        inputChannel.close();
-                                        outputChannel.close();
-                                        source_fis.close();
-                                        dest_fos.close();
-                        }                
-                        catch(Exception e){
+                String fullPath = getFrameFullPathName(frameToRestore.getPath(), frameToRestore
+                                .getName());
+                //System.out.println("fullpath: " + fullPath);
+                String restoreVersion = fullPath + ".restore";
+                //System.out.println("restoreversion" + restoreVersion);
+                File source = new File(restoreVersion);
+                File dest = new File(fullPath);
+                
+                FileChannel inputChannel = null;
+                FileChannel outputChannel = null;
+                
+                try{
+                                FileInputStream source_fis = new FileInputStream(source);
+                                inputChannel = source_fis.getChannel();
                                 
-                                System.err.println("No restore point detected.");
-                        }
-                        String frameName = frameToRestore.getName();
-                        String frameNameLower = frameName.toLowerCase();
-                        
-                        // first try reading from cache
-                        if (isCacheOn() && _Cache.containsKey(frameNameLower)) {
-                                Logger.Log(Logger.SYSTEM, Logger.LOAD, "Clearing " + frameName
-                                                + " from cache.");
-                                _Cache.remove(frameNameLower);                          
-                        }
-                        
-                        return LoadFrame(frameName, frameToRestore.getPath(), true);
-                }               
+                                FileOutputStream dest_fos = new FileOutputStream(dest);
+                                outputChannel = dest_fos.getChannel();
+                                
+                                outputChannel.transferFrom(inputChannel, 0, inputChannel.size());
+                                inputChannel.close();
+                                outputChannel.close();
+                                source_fis.close();
+                                dest_fos.close();
+                }                
+                catch(Exception e){     
+                        System.err.println("No restore point detected.");
+                }
+                String frameName = frameToRestore.getName();
+                String frameNameLower = frameName.toLowerCase();
+                
+                // first try reading from cache
+                if (isCacheOn() && _Cache.containsKey(frameNameLower)) {
+                        Logger.Log(Logger.SYSTEM, Logger.LOAD, "Clearing " + frameName
+                                        + " from cache.");
+                        _Cache.remove(frameNameLower);                          
+                }
+                
+                return LoadFrame(frameName, frameToRestore.getPath(), true);
+        }               
                 
         public static BufferedReader LoadPublicFrame(String frameName) {
@@ -1809 +1814 @@
 
         public static void setSavedProperties(Frame toSave) {
-                toSave.setLastModifyDate(Formatter.getDateTime());
+                toSave.setLastModifyDate(Formatter.getDateTime(), System.currentTimeMillis());
                 toSave.setLastModifyUser(UserSettings.UserName.get());
                 toSave.setVersion(toSave.getVersion() + 1);