Changeset 103 for trunk/src/org/expeditee/actions/Actions.java

Timestamp:

06/13/08 18:00:25 (16 years ago)

Author:

ra33

Message:

Fixed up a few bugs with Saving of frames when actions are performed and with Comet and Tree stats.

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (6 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -74 +74 @@
                 // Must be a forward slash for loading resources
                 String path = pckgname.replace('.', '/');
-                //System.out.println("Get classes: " + path);
+                // System.out.println("Get classes: " + path);
                 try {
                         ClassLoader cld = Thread.currentThread().getContextClassLoader();
@@ -105 +105 @@
                                         + ") does not appear to be a valid package");
                 }
-                //System.out.println("Path:" + directory.getPath());
+                // System.out.println("Path:" + directory.getPath());
                 int splitPoint = directory.getPath().indexOf('!');
                 if (splitPoint > 0) {
@@ -118 +118 @@
                                         jarName = jarName.replace("%20", " ");
                                 }
-                                //System.out.println("JarName:" + jarName);
+                                // System.out.println("JarName:" + jarName);
                                 JarFile jarFile = new JarFile(jarName);
 
@@ -138 +138 @@
                                 }
                                 jarFile.close();
-                                //System.out.println("Loaded " + classCount + " classes from "
-                                //              + pckgname);
+                                // System.out.println("Loaded " + classCount + " classes from "
+                                // + pckgname);
 
                         } catch (Exception e) {
@@ -291 +291 @@
          */
         public static void PerformAction(Frame source, Item launcher, String command) {
-                if (!command.equalsIgnoreCase("Restore"))
-                        FrameIO.SaveFrame(source, false);
+                // if (!command.equalsIgnoreCase("Restore"))
+                // FrameIO.SaveFrame(source, false);
+                // TODO make restore UNDO the changes made by the last action
 
                 // separate method name and parameter names
@@ -381 +382 @@
                 name = name.toLowerCase();
                 // save the current frame (if necesssary)
-                FrameUtils.LeavingFrame(source);
+                // TODO make this nicer... ie. make Format an action rather than an
+                // agent and save frames only before running agents
+                if (!name.equalsIgnoreCase("format") && !name.equalsIgnoreCase("sort")) {
+                        FrameUtils.LeavingFrame(source);
+                }
 
                 try {