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

Timestamp:

07/28/08 15:08:13 (16 years ago)

Author:

ra33

Message:

Added faster versions of search frameset

File:

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

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

@@ -5 +5 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -10 +11 @@
 import java.io.IOException;
 import java.sql.Time;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
 
 import org.expeditee.agents.ExistingFramesetException;
@@ -239 +242 @@
         }
 
+        public static Collection<String> searchFrame(String frameName,
+                        String pattern, String path) {
+                String fullPath = null;
+                if (path == null) {
+                        for (String possiblePath : UserSettings.FrameDirs) {
+                                fullPath = getFrameFullPathName(possiblePath, frameName);
+                                if (fullPath != null)
+                                        break;
+                        }
+                } else {
+                        fullPath = getFrameFullPathName(path, frameName);
+                        assert(fullPath != null);
+                }
+                // If the frame was not located return null
+                if (fullPath == null)
+                        return null;
+                Collection<String> results = new LinkedList<String>();
+                // Open the file and search the text items
+                try {
+                        BufferedReader reader = new BufferedReader(new FileReader(fullPath));
+                        String next;
+                        while (reader.ready() && ((next = reader.readLine()) != null)) {
+                                if (next.startsWith("T")) {
+                                        String toSearch = next.substring(2);
+                                        if (toSearch.toLowerCase().matches(pattern))
+                                                results.add(toSearch);
+                                }
+                        }
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                        return null;
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                return results;
+        }
+
         private static Frame LoadFrame(String path, String frameName) {
                 String fullPath = getFrameFullPathName(path, frameName);
@@ -349 +389 @@
                 // if we did not find another Frame then this one must be the last one
                 // in the frameset
-                MessageBay
-                                .displayMessageOnce("This is the last frame in the frameset");
+                MessageBay.displayMessageOnce("This is the last frame in the frameset");
                 return null;
         }
@@ -421 +460 @@
          * @param toDelete
          *            The Frame to be deleted
-         * @return The name the deleted frame was changed to, or null if the delete failed
+         * @return The name the deleted frame was changed to, or null if the delete
+         *         failed
          */
         public static String DeleteFrame(Frame toDelete) throws IOException,
@@ -468 +508 @@
                 ff.close();
 
-                if( del.delete()){
+                if (del.delete()) {
                         return toDelete.getName();
                 }
-                
+
                 return null;
         }
@@ -552 +592 @@
                                 i.setLink(null);
                 }
-                
+
                 // do auto shrinking of the title IF not in twin frames mode
                 Item titleItem = template.getTitleItem();
@@ -676 +716 @@
                         boolean checkBackup) {
 
-                // TODO When loading a frame maybe append onto the event history too- with a
+                // 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()){
+                if (toSave == null || !toSave.hasChanged() || toSave.isSaved()) {
                         SessionStats.NewFrameSession();
                         return "";
@@ -691 +732 @@
 
                 // Dont save if the frame is protected and it exists
-                if (checkBackup
-                                && toSave.isReadOnly()) {
+                if (checkBackup && toSave.isReadOnly()) {
                         _Cache.remove(toSave.getName().toLowerCase());
                         SessionStats.NewFrameSession();
@@ -776 +816 @@
                         toSave.setActiveTime(activeTime);
 
-                        //int oldMode = FrameGraphics.getMode();
-                        //if (oldMode != FrameGraphics.MODE_XRAY)
-                        //      FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
+                        // int oldMode = FrameGraphics.getMode();
+                        // if (oldMode != FrameGraphics.MODE_XRAY)
+                        // FrameGraphics.setMode(FrameGraphics.MODE_XRAY, true);
                         writer.writeFrame(toSave);
-                        //FrameGraphics.setMode(oldMode, true);
+                        // FrameGraphics.setMode(oldMode, true);
                         toSave.setSaved();
                         if (inc) {