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

Timestamp:

09/16/08 16:29:27 (16 years ago)

Author:

ra33

Message:

Can navigate with PgUp PgDn Home and End with remote framesets

File:

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

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

@@ -128 +128 @@
                 MessageBay.supressMessages(true);
                 // loading automatically caches the frame is caching is turned on
-                LoadUnknownPath(framename, false);
+                LoadFromDisk(framename, null, false);
                 MessageBay.supressMessages(false);
         }
@@ -150 +150 @@
 
         public static Frame LoadFrame(String frameName) {
-                return LoadFrame(frameName, false);
-        }
-
-        public static Frame LoadFrame(String frameName, boolean ignoreAnnotations) {
+                return LoadFrame(frameName, null, false);
+        }
+
+        public static Frame LoadFrame(String frameName, String path) {
+                return LoadFrame(frameName, path, false);
+        }
+
+        public static Frame LoadFrame(String frameName, String path,
+                        boolean ignoreAnnotations) {
                 if (!isValidFrameName(frameName))
                         return null;
@@ -168 +173 @@
                 Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName
                                 + " from disk.");
-                return LoadUnknownPath(frameName, ignoreAnnotations);
+
+                return LoadFromDisk(frameName, path, ignoreAnnotations);
         }
 
@@ -174 +180 @@
                 String fullPath = FrameIO.getFrameFullPathName(PUBLIC_PATH, frameName);
 
+                if(fullPath == null)
+                        return null;
+                
                 File frameFile = new File(fullPath);
                 if (frameFile.exists() && frameFile.canRead()) {
@@ -185 +194 @@
         }
 
-        private static Frame LoadUnknownPath(String framename,
+        private static Frame LoadFromDisk(String framename, String knownPath,
                         boolean ignoreAnnotations) {
                 Frame loaded = null;
 
-                for (String path : UserSettings.FrameDirs) {
-                        loaded = LoadFrame(path, framename);
-                        if (loaded != null) {
-                                break;
-                        }
-                }
-
+                if (knownPath != null) {
+                        loaded = LoadKnowPath(knownPath, framename);
+                } else {
+
+                        for (String path : UserSettings.FrameDirs) {
+                                loaded = LoadKnowPath(path, framename);
+                                if (loaded != null) {
+                                        break;
+                                }
+                        }
+                }
+                
                 if (loaded == null && FrameShare.getInstance() != null) {
-                        loaded = FrameShare.getInstance().loadFrame(framename);
+                        loaded = FrameShare.getInstance().loadFrame(framename, knownPath);
                 }
 
@@ -321 +335 @@
         }
 
-        private static Frame LoadFrame(String path, String frameName) {
+        private static Frame LoadKnowPath(String path, String frameName) {
                 String fullPath = getFrameFullPathName(path, frameName);
                 if (fullPath == null)
@@ -386 +400 @@
                 // loop until a frame that exists is found
                 for (; num >= 0; num--) {
-                        Frame f = LoadFrame(name + num);
+                        Frame f = LoadFrame(name + num, current.getPath());
                         if (f != null)
                                 return f;
@@ -415 +429 @@
                 // read the maximum from the INF file
                 try {
-                        max = ReadINF(current.getPath(), current.getFramesetName());
+                        max = ReadINF(current.getPath(), current.getFramesetName(), false);
                 } catch (IOException ioe) {
                         MessageBay.errorMessage("Error loading INF file for frameset '"
@@ -424 +438 @@
                 // loop until a frame that exists is found
                 for (; num <= max; num++) {
-                        Frame f = LoadFrame(name + num);
+                        Frame f = LoadFrame(name + num, current.getPath());
                         if (f != null)
                                 return f;
@@ -454 +468 @@
                 int max;
                 try {
-                        max = ReadINF(path, framesetName);
+                        max = ReadINF(path, framesetName, false);
                 } catch (IOException ioe) {
                         MessageBay.errorMessage("Error loading INF file for frameset '"
@@ -463 +477 @@
                 // loop backwards until a frame that exists is found
                 for (int num = max; num > 0; num--) {
-                        Frame f = LoadFrame(framesetName + num);
+                        Frame f = LoadFromDisk(framesetName + num, path, false);
                         if (f != null)
                                 return f;
@@ -610 +624 @@
                 // read the next number from the INF file
                 try {
-                        next = ReadINF(destFramesetZero.getPath(), frameset);
+                        next = ReadINF(destFramesetZero.getPath(), frameset, true);
                 } catch (IOException ioe) {
                         ioe.printStackTrace();
@@ -626 +640 @@
                 Logger.Log(Logger.SYSTEM, Logger.TDFC, "Creating new frame: "
                                 + template.getName() + " from TDFC");
-
-                // update INF file
-                try {
-                        WriteINF(template.getPath(), frameset, frameset + next);
-                } catch (IOException ioe) {
-                        ioe.printStackTrace();
-                        Logger.Log(ioe);
-                }
 
                 template.setOwner(UserSettings.Username);
@@ -822 +828 @@
                                 _Cache.remove(toSave.getName().toLowerCase());
                                 int nextnum = ReadINF(toSave.getPath(), toSave
-                                                .getFramesetName()) + 1;
+                                                .getFramesetName(), false) + 1;
                                 SuspendCache();
                                 Frame original = LoadFrame(toSave.getName());
@@ -851 +857 @@
                                 int orignum = original.getNumber();
                                 int nextnum = ReadINF(toSave.getPath(), toSave
-                                                .getFramesetName()) + 1;
+                                                .getFramesetName(), false) + 1;
 
                                 original.setFrameNumber(nextnum);
@@ -885 +891 @@
 
                         // check that the INF file is not out of date
-                        int last = ReadINF(toSave.getPath(), toSave.getFramesetName());
+                        int last = ReadINF(toSave.getPath(), toSave.getFramesetName(),
+                                        false);
                         if (last <= toSave.getNumber())
                                 WriteINF(toSave.getPath(), toSave.getFramesetName(), toSave
@@ -947 +954 @@
          *             the INF.
          */
-        private static int ReadINF(String path, String frameset) throws IOException {
+        public static int ReadINF(String path, String frameset, boolean update)
+                        throws IOException {
                 assert (!frameset.endsWith("."));
-
-                // read INF
-                BufferedReader reader;
                 try {
-                        reader = new BufferedReader(new FileReader(path
-                                        + frameset.toLowerCase() + File.separator + INF_FILENAME));
+                        // read INF
+                        BufferedReader reader;
+                        try {
+                                // Check on the local drive
+                                reader = new BufferedReader(new FileReader(path
+                                                + frameset.toLowerCase() + File.separator
+                                                + INF_FILENAME));
+                        } catch (Exception e) {
+                                reader = new BufferedReader(new FileReader(path
+                                                + frameset.toLowerCase() + File.separator
+                                                + frameset.toLowerCase() + ".inf"));
+                        }
+                        String inf = reader.readLine();
+                        reader.close();
+
+                        int next = Conversion.getFrameNumber(inf);
+                        // update INF file
+                        if (update) {
+                                try {
+                                        WriteINF(path, frameset, frameset + (next + 1));
+                                } catch (IOException ioe) {
+                                        ioe.printStackTrace();
+                                        Logger.Log(ioe);
+                                }
+                        }
+                        return next;
                 } catch (Exception e) {
-                        reader = new BufferedReader(new FileReader(path
-                                        + frameset.toLowerCase() + File.separator
-                                        + frameset.toLowerCase() + ".inf"));
-                }
-                String inf = reader.readLine();
-                reader.close();
-
-                return Conversion.getFrameNumber(inf);
+                }
+
+                // Check peers
+                return FrameShare.getInstance().getInfNumber(path, frameset, update);
         }
 
@@ -975 +1000 @@
          *             Any exception encountered by the BufferedWriter.
          */
-        private static void WriteINF(String path, String frameset, String frameName)
+        public static void WriteINF(String path, String frameset, String frameName)
                         throws IOException {
-                assert (!frameset.endsWith("."));
-
-                path += frameset.toLowerCase() + File.separator + INF_FILENAME;
-
-                BufferedWriter writer = new BufferedWriter(new FileWriter(path));
-                writer.write(frameName);
-                writer.close();
+                try {
+                        assert (!frameset.endsWith("."));
+
+                        path += frameset.toLowerCase() + File.separator + INF_FILENAME;
+
+                        BufferedWriter writer = new BufferedWriter(new FileWriter(path));
+                        writer.write(frameName);
+                        writer.close();
+                } catch (Exception e) {
+
+                }
         }
 
@@ -1090 +1119 @@
 
                 try {
-                        num = ReadINF(zero.getPath(), frameset);
+                        num = ReadINF(zero.getPath(), frameset, false);
                 } catch (IOException e) {
                         // TODO Auto-generated catch block
@@ -1368 +1397 @@
                                 try {
                                         nextNum = ReadINF(PUBLIC_PATH, Conversion
-                                                        .getFramesetName(frameName)) + 1;
+                                                        .getFramesetName(frameName), false) + 1;
                                 } catch (IOException e) {
                                         e.printStackTrace();
@@ -1399 +1428 @@
                                                 "Your version was renamed " + newName, peerName);
                         }
-
-                        // Save the new version
-                        try {
-                                FileWriter fw = new FileWriter(file);
-                                String nextLine = null;
-                                while ((nextLine = packetContents.readLine()) != null) {
-                                        fw.write(nextLine + '\n');
-                                }
-                                fw.flush();
-                                fw.close();
-                                MessageBay.displayMessage("Saved remote frame: " + frameName);
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
-                } else {
-                        MessageBay
-                                        .errorMessage("Recieved request for unknown public frame: "
-                                                        + frameName);
-                }
+                }
+
+                // Save the new version
+                try {
+                        FileWriter fw = new FileWriter(file);
+                        String nextLine = null;
+                        while ((nextLine = packetContents.readLine()) != null) {
+                                fw.write(nextLine + '\n');
+                        }
+                        fw.flush();
+                        fw.close();
+                        MessageBay.displayMessage("Saved remote frame: " + frameName);
+                } catch (IOException e) {
+                        MessageBay.errorMessage("Error remote saving " + frameName + ": "
+                                        + e.getMessage());
+                        e.printStackTrace();
+                }
+                // } else {
+                //                      
+                //                      
+                //                      
+                // MessageBay
+                // .errorMessage("Recieved save request for unknown public frame: "
+                // + frameName);
+                // }
         }