Changeset 416

Timestamp:

11/20/08 14:36:41 (16 years ago)

Author:

ra33

Message:

Renamed "FramesEdited.stats"
Added @NoSave tag

Location:

trunk/src/org/expeditee

Files:

• gui/FrameIO.java (modified) (9 diffs)
• stats/StatsLogger.java (modified) (1 diff)

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

@@ -671 +671 @@
                 if (!DisplayIO.isTwinFramesOn()) {
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
-                                while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE && titleItem.getBoundsWidth() + titleItem.getX() > template
-                                                .getNameItem().getX()) {
+                                while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE
+                                                && titleItem.getBoundsWidth() + titleItem.getX() > template
+                                                                .getNameItem().getX()) {
                                         titleItem.setSize(titleItem.getSize() - 1);
-                                        
+
                                 }
                         } else {
@@ -680 +681 @@
                         }
                 }
-                
+
                 // Assign a width to the title.
                 titleItem.setRightMargin(template.getNameItem().getX(), true);
-                
+
                 return template;
         }
@@ -775 +776 @@
         /**
          * Saves a frame.
-         * @param toSave the frame to save
-         * @param inc true if the frames counter should be incremented
+         * 
+         * @param toSave
+         *            the frame to save
+         * @param inc
+         *            true if the frames counter should be incremented
          * @return the text content of the frame
          */
@@ -815 +819 @@
                 }
 
+                /* Dont save the frame if it has the noSave tag */
+                if (toSave.hasAnnotation("nosave")) {
+                        Actions.PerformActionCatchErrors(toSave, null, "Restore");
+                        return "";
+                }
+
                 // Save frame that is not local through the Networking classes
                 // TODO
@@ -821 +831 @@
                 }
 
-                /*Format the frame if it has the autoFormat tag*/
-                if(toSave.hasAnnotation("autoformat")){
+                /* Format the frame if it has the autoFormat tag */
+                if (toSave.hasAnnotation("autoformat")) {
                         Actions.PerformActionCatchErrors(toSave, null, "Format");
                 }
-                
+
                 /**
                  * Get the full path only to determine which format to use for saving
@@ -855 +865 @@
 
                         // Check if the frame doesnt exist
-//                      if (savedVersion < 0) {
-//                              /*
-//                               * This will happen if the user has two Expeditee's running at
-//                               * once and closes the first. When the second one closes the
-//                               * messages directory will have been deleted.
-//                               */
-//                              MessageBay
-//                                              .errorMessage("Could not save frame that does not exist: "
-//                                                              + toSave.getName());
-//                              return null;
-//                      }
+                        // if (savedVersion < 0) {
+                        // /*
+                        // * This will happen if the user has two Expeditee's running at
+                        // * once and closes the first. When the second one closes the
+                        // * messages directory will have been deleted.
+                        // */
+                        // MessageBay
+                        // .errorMessage("Could not save frame that does not exist: "
+                        // + toSave.getName());
+                        // return null;
+                        // }
 
                         // Check if we are trying to save an out of date version
@@ -980 +990 @@
                         return false;
                 return toCheck.getPath().equals(PROFILE_PATH);
-                //return toCheck.getFramesetName()
-                //              .equalsIgnoreCase(UserSettings.ProfileName);
+                // return toCheck.getFramesetName()
+                // .equalsIgnoreCase(UserSettings.ProfileName);
         }
 
@@ -1315 +1325 @@
                 if (!FrameIO.canAccessFrameset(framesetName))
                         return false;
-                //Clear the cache
+                // Clear the cache
                 _Cache.clear();
-                
+
                 // Search all the available directories for the directory
                 for (String path : UserSettings.FrameDirs) {
@@ -1331 +1341 @@
                                 if (!dest.getParentFile().exists())
                                         dest.mkdirs();
-                                // If a frameset with the same name is already in the destination add
+                                // If a frameset with the same name is already in the
+                                // destination add
                                 // a number to the end
                                 while (dest.exists()) {

trunk/src/org/expeditee/stats/StatsLogger.java

@@ -19 +19 @@
 
         private static String _filename = null;
-        private static final String FRAMES_EDITED_FILENAME = "FramesEdited.stat";
+        private static final String FRAMES_EDITED_FILENAME = "FramesEdited.log";
 
         /**