Changeset 25

Timestamp:

05/13/08 15:32:17 (16 years ago)

Author:

ra33

Message:

Added forced garbage collection into DisplayTree when memory gets low.

Removed another method which was for dealing with frameset names ending in a number

Location:

trunk/src/org/expeditee

Files:

• agents/DisplayTree.java (modified) (3 diffs)
• gui/Browser.java (modified) (1 diff)
• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameIO.java (modified) (5 diffs)
• gui/FrameUtils.java (modified) (2 diffs)

trunk/src/org/expeditee/agents/DisplayTree.java

@@ -3 +3 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.TimeKeeper;
@@ -27 +28 @@
         private static final long TIMER_RESOLUTION = 10;
 
+        private Runtime _runtime = Runtime.getRuntime();
+        
         private long _timeRemaining = 0;
 
@@ -61 +64 @@
         @Override
         protected void processFrame(Frame toProcess) {
+                long freeMemory = _runtime.freeMemory();
+                if(freeMemory < 100000){
+                        _runtime.gc();
+                        FrameGraphics.DisplayMessage("GARBAGE COLLECT!");
+                } else if (freeMemory % 10 == 0)
+                        System.out.println(_runtime.freeMemory());
+                
                 FrameUtils.ResponseTimer.restart();
                 

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

@@ -76 +76 @@
 
                 UserSettings.Init();
-                UserSettings.Username = System.getProperty("user.name");
-                String userName = FrameIO.ConvertToValidFramesetName(UserSettings.Username);
+                UserSettings.Username = FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"));
+                String userName = UserSettings.Username;
                 Frame profile = FrameIO.LoadProfile(userName);
                 if (profile == null) {

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

@@ -59 +59 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp09May2008A";
+        public static final String TITLE = "Exp13May2008A";
 
         private DisplayIO() {

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

@@ -75 +75 @@
         public static final int MAX_NAME_LENGTH = 64;
 
-        public static final int MAX_CACHE = 20;
+        public static final int MAX_CACHE = 2000;
 
         private static HashMap<String, Frame> _Cache = new HashMap<String, Frame>();
@@ -285 +285 @@
                                 .getFrameName());
                 _UseCache = cache;
-
                 if (_Cache.containsKey(fresh.getFrameName().toLowerCase()))
                         _Cache.put(fresh.getFrameName().toLowerCase(), fresh);
-
                 DisplayIO.setCurrentFrame(fresh);
         }
@@ -548 +546 @@
 
         /**
-         * If the userName ends in a letter a period is appended before adding the
-         * numeric extension
-         * 
-         * @param framesetName
-         *            the current userName
-         * @return the exension for the current user
-         */
-        public static String getFramesetExtension(String framesetName) {
-                if (framesetName.charAt(framesetName.length() - 1) >= '0'
-                                && framesetName.charAt(framesetName.length() - 1) <= '9') {
-                        return ".1";
-                }
-                return "1";
-        }
-
-        /**
          * Creates a new frameset using the given name. This includes creating a new
          * subdirectory in the <code>FRAME_PATH</code> directory, Copying over the
@@ -714 +696 @@
 
         public static Frame LoadProfile(String userName) {
-                return LoadFrame(userName + FrameIO.getFramesetExtension(userName));
+                return LoadFrame(userName + "1");
         }
 
@@ -935 +917 @@
                 // create the new INF file
                 try {
-                        WriteINF(path, frameset, frameset + getFramesetExtension(frameset));
+                        WriteINF(path, frameset, frameset + '1');
                 } catch (IOException ioe) {
                         ioe.printStackTrace();

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

@@ -392 +392 @@
 
         public static void DisplayProfileFrame() {
-                DisplayFrame(UserSettings.Username
-                                + FrameIO.getFramesetExtension(UserSettings.Username));
+                DisplayFrame(UserSettings.Username + '1');
         }
 
@@ -1240 +1239 @@
                                 for (File helpFrameset : helpFramesets) {
                                         String framesetName = helpFrameset.getName();
-                                        Frame indexFrame = FrameIO.LoadFrame(framesetName
-                                                        + FrameIO.getFramesetExtension(framesetName));
+                                        Frame indexFrame = FrameIO.LoadFrame(framesetName+ '1');
                                         // Look through the folder for help index pages
                                         if (indexFrame != null