Changeset 103

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.

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (6 diffs)
• agents/DisplayComet.java (modified) (2 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (11 diffs)
• stats/CometStats.java (modified) (1 diff)
• stats/SessionStats.java (modified) (8 diffs)
• stats/TreeStats.java (modified) (1 diff)

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 {

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

@@ -26 +26 @@
         protected Frame process(Frame frame) {
                 Collection<String> seen = new HashSet<String>();
+                
+                DisplayIO.addToBack(frame);
+                
                 // Goto the end of the comet
                 Item old = null;
                 Frame oldFrame = frame;
                 while (oldFrame != null) {
+                        if(_stop)
+                                return null;
                         seen.add(oldFrame.getName().toLowerCase());
                         _frameList.push(oldFrame);
@@ -46 +51 @@
                 // Back out one frame at a time
                 while (!_frameList.empty()) {
+                        if(_stop)
+                                return null;
                         DisplayIO.setCurrentFrame(_frameList.pop());
                         _frameCount++;

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

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

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

@@ -579 +579 @@
                         if (!item.isAnnotation())
                                 continue;
-                        
-                        String attribute = AttributeUtils.getAttribute(item.getText());
-                        if(attribute == null || attribute.length() < 3)
+
+                        String attributeFullCase = AttributeUtils.getAttribute(item
+                                        .getText());
+                        // TODO Change the line below so that it does not complain for built
+                        // in attributes
+                        if (attributeFullCase == null || attributeFullCase.length() < 4)
                                 continue;
-                        attribute = attribute.substring(1).toLowerCase();
-                        
+                        String attribute = attributeFullCase.substring(1).toLowerCase();
+
                         if (attribute.equals("homeframe")) {
                                 String first = getLink(item, UserSettings.FirstFrame);
@@ -593 +596 @@
                                 // warn the user
                                 else {
-                                        //FrameGraphics.WarningMessage("Home frame: " + first
-                                        //              + " is not a valid frame.");
+                                        // FrameGraphics.WarningMessage("Home frame: " + first
+                                        // + " is not a valid frame.");
                                         UserSettings.FirstFrame = profile.getName();
                                 }
@@ -627 +630 @@
                         } else if (attribute.equals("logging")) {
                                 UserSettings.Logging = getBoolean(item, UserSettings.Logging);
-                        } else if (attribute.equals(
-                                        "itemtemplate")) {
+                        } else if (attribute.equals("itemtemplate")) {
                                 UserSettings.ItemTemplate = ((Text) item).getTemplateForm();
-                        } else if (attribute.equals(
-                                        "annotationtemplate")) {
+                        } else if (attribute.equals("annotationtemplate")) {
                                 UserSettings.AnnotationTemplate = ((Text) item)
                                                 .getTemplateForm();
-                        } else if (attribute.equals(
-                                        "statstemplate")) {
+                        } else if (attribute.equals("statstemplate")) {
                                 UserSettings.StatTemplate = ((Text) item).getTemplateForm();
-                        } else if (attribute.equals(
-                                        "commenttemplate")) {
+                        } else if (attribute.equals("commenttemplate")) {
                                 UserSettings.CodeCommentTemplate = ((Text) item)
                                                 .getTemplateForm();
-                        } else if (attribute.equals(
-                                        "linetemplate")) {
+                        } else if (attribute.equals("linetemplate")) {
                                 UserSettings.LineTemplate = ((Text) item).getTemplateForm();
                         } else if (attribute.equals("framesetdir")) {
                                 String dir = getDir(item, null);
-                                if (dir != null){
+                                if (dir != null) {
                                         UserSettings.FrameDirs.add(dir);
                                 }
@@ -668 +666 @@
                                 UserSettings.FrameDirs.addAll(getDirs(item));
                         } else {
-                                FrameGraphics.WarningMessage("[" + item.getText() + "]" + " is not a profile frame tag");
+                                FrameGraphics.WarningMessage(attributeFullCase
+                                                + " is not a profile frame tag");
                         }
                 }
@@ -761 +760 @@
                                 else
                                         return name + File.separator;
-                        }else{
+                        } else {
                                 FrameGraphics.ErrorMessage("Directory not found: " + name);
                         }
-                }else{
-                        FrameGraphics.WarningMessage("Missing value for profile attribute" + name);
+                } else {
+                        FrameGraphics.WarningMessage("Missing value for profile attribute"
+                                        + name);
                 }
                 return alt;
@@ -870 +870 @@
                                 i.Permission = permissionLevel;
                                 if (i instanceof Text && i.isAnnotation()) {
-                                        if (ItemUtils.startsWithTag(i,
-                                                        ItemUtils.TAG_POINTTYPE)) {
+                                        if (ItemUtils.startsWithTag(i, ItemUtils.TAG_POINTTYPE)) {
                                                 Text txt = (Text) i;
                                                 String line = txt.getFirstLine();
@@ -896 +895 @@
                                         else if (ItemUtils.startsWithTag(i, ItemUtils.TAG_VECTOR)
                                                         && i.getLink() != null) {
+                                                // TODO It is possible to get into an infinate loop if a
+                                                // frame contains an @ao which leads to a frame with an
+                                                // @v which points back to the frame with the @ao
+
                                                 Frame vector = FrameIO.LoadFrame(i.getAbsoluteLink());
                                                 if (vector != null) {
@@ -913 +916 @@
                                         else if (ItemUtils.startsWithTag(i, ItemUtils.TAG_OVERLAY)
                                                         && i.getLink() != null) {
+                                                if (i.getAbsoluteLink().equalsIgnoreCase(
+                                                                toParse.getName())) {
+                                                        // This frame contains an active overlay which
+                                                        // points to itself
+                                                        FrameGraphics.ErrorMessage(toParse.getName()
+                                                                        + " contains an @o which links to itself");
+                                                        continue;
+                                                }
+
                                                 Frame overlay = FrameIO.LoadFrame(i.getAbsoluteLink());
                                                 // Parse(overlay);
@@ -924 +936 @@
                                                         && i.getLink() != null) {
                                                 String link = i.getAbsoluteLink();
+                                                if (link.equalsIgnoreCase(toParse.getName())) {
+                                                        // This frame contains an active overlay which
+                                                        // points to itself
+                                                        FrameGraphics.ErrorMessage(toParse.getName()
+                                                                        + " contains an @ao which links to itself");
+                                                        continue;
+                                                }
                                                 Frame overlay = FrameIO.LoadFrame(link);
                                                 // Parse(overlay);
@@ -975 +994 @@
                                                         }
                                                 }
-                                                //TODO decide exactly what to do here!!
+                                                // TODO decide exactly what to do here!!
                                                 toParse.addAnnotation((Text) i);
                                         }
@@ -1418 +1437 @@
                                 for (File helpFrameset : helpFramesets) {
                                         String framesetName = helpFrameset.getName();
-                                        if(!FrameIO.isValidFramesetName(framesetName))
+                                        if (!FrameIO.isValidFramesetName(framesetName))
                                                 continue;
                                         Frame indexFrame = FrameIO.LoadFrame(framesetName + '1');

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

@@ -56 +56 @@
 
                 StringBuffer sb = new StringBuffer();
+                sb.append(SessionStats.getDate());
                 sb.append("CometName: ").append(_name).append('\n');
-                sb.append("Edits: ").append(_sessions).append('\n');
+                sb.append("Versions: ").append(_sessions).append('\n');
                 sb.append("            Current  | Average  | Total").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()

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

@@ -89 +89 @@
 
         public static String getCurrentStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
 
                 long elapsedTime = (new Date()).getTime() - _StartTime.getTime();
@@ -107 +107 @@
 
         private static String getTimeElapsed() {
-                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
                 Date currentTime = new Date();
                 long elapsedTime = currentTime.getTime() - _StartTime.getTime();
-                String time = formatter.format(_StartTime);
-                time += "-->" + formatter.format(currentTime);
-                time += " = " + (int) (elapsedTime / MILLISECONDS_PER_MINUTE); // (new
+                String time = "" + (int) ((double)elapsedTime / MILLISECONDS_PER_MINUTE + 0.5); // (new
                 // SimpleDateFormat("m").format(elapsedTime));
 
@@ -260 +257 @@
                 if (_StatsEnabled) {
                         _AccessedFrames++;
-                        _FrameEvents.clear();
-                        _FrameAccessTime = new Date();
-                        _FrameAccessDarkTime = (Time) _DarkTime.clone();
                 }
         }
@@ -269 +263 @@
                 FrameEdited(frameName);
                 _SavedFrames++;
+                
+                _FrameEvents.clear();
+                _FrameAccessTime = new Date();
+                _FrameAccessDarkTime = (Time) _DarkTime.clone();
         }
 
@@ -350 +348 @@
 
         private static void FrameEdited(String name) {
-                _FramesEdited.append(Logger.EasyDateFormat("ddMMMyyyy-HHmm:ss"))
+                _FramesEdited.append(Logger.EasyDateFormat("ddMMMyyyy:HHmm:ss"))
                                 .append("[").append(name).append("]\n");
         }
@@ -402 +400 @@
 
         public static String getItemStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
                 int max = 0;
                 for (int i = 0; i < STAT_TYPES; i++) {
@@ -436 +434 @@
 
         public static String getEventStats() {
-                StringBuffer stats = getSessionDateTime();
+                StringBuffer stats = getLength();
                 int max = getMax(_EventTimes);
                 int maxWidthEvents = ("" + max).length();
@@ -485 +483 @@
          * @return
          */
-        private static StringBuffer getSessionDateTime() {
+        public static StringBuffer getLength() {
+                StringBuffer stats = getDate();
+                stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
+                return stats;
+        }
+        
+        public static StringBuffer getDate() {
                 StringBuffer stats = new StringBuffer("Date: ");
-                stats.append(Logger.EasyDateFormat("ddMMMyyyy")).append("\n");
-                stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
+                stats.append(Logger.EasyDateFormat("ddMMMyyyy:HHmm")).append("\n");
                 return stats;
         }

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

@@ -68 +68 @@
 
                 StringBuffer sb = new StringBuffer();
+                sb.append(SessionStats.getDate());
                 sb.append("TopFrame: ").append(_name).append('\n');
                 sb.append("Frames:   ").append(_treeFrames).append('\n');
                 sb.append("Versions: ").append(_treeSessions).append('\n');
-                sb.append("            FrameAve |VersionAve| Total").append('\n');
+                sb.append("           VersionAve| FrameAve | Total").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()
                                 / (1.0 * _treeFrames)));