Changeset 23

Timestamp:

05/13/08 11:48:32 (16 years ago)

Author:

ra33

Message:

Fixed bug in session stats that caused an exception when there were no stats... this was preventing profile frame from being created correctly!

Location:

trunk/src/org/expeditee

Files:

• agents/CopyTree.java (modified) (5 diffs)
• gui/Browser.java (modified) (1 diff)
• gui/DisplayIO.java (modified) (1 diff)
• gui/FrameIO.java (modified) (1 diff)
• stats/SessionStats.java (modified) (1 diff)

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

@@ -5 +5 @@
 
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
@@ -48 +49 @@
                         processFrame(zero);
                 } catch (ExistingFramesetException efe) {
-                        // get the frame path
-                        Frame zero = FrameIO.LoadFrame(_nameTo + "0");
-                        _framePath = zero.path;
-                        _firstNumber = _lastNumber + 1;
+                        FrameGraphics.ErrorMessage("A frameset called " + _nameTo
+                                        + " already exists.");
+                        return false;
                 } catch (Exception e) {
                         return false;
@@ -80 +80 @@
                 for (Item i : fresh.getItems())
                         if (i.getLink() != null && !i.isAnnotation() && i.isLinkValid()) {
-                                String link = i.getLink();
-                                link = link.toLowerCase();
-                                // link = link.replace(_nameFrom, _nameTo);
+                                String link = i.getLink().toLowerCase();
+                                //convert to absolute link with the old framesetName
+                                if (FrameIO.isPositiveInteger(link)){
+                                        link = _nameFrom + link;
+                                }
+                                //check if we already have this in our map
                                 if (_nameMap.containsKey(link))
                                         link = _nameMap.get(link);
+                                //otherwise add it to our map
                                 else if (link.startsWith(_nameFrom)) {
                                         _nameMap.put(link, _nameTo + (++_lastNumber));
-                                        link = _nameTo + _lastNumber;
+                                        link = "" + _lastNumber;
                                 }
                                 i.setLink(link);
@@ -93 +97 @@
                                         && i.isLinkValid()) {
                                 // annotation links need to be parsed at the end
-                                if (i.getLink().toLowerCase().startsWith(_nameFrom)) {
+                                if (i.getAbsoluteLink().toLowerCase().startsWith(_nameFrom)) {
                                         _toReparse.add(fresh.getFrameName());
                                         added = true;
@@ -101 +105 @@
 
                 fresh.path = _framePath;
-                FrameIO.SaveFrame(fresh);
+                FrameIO.ForceSaveFrame(fresh);
                 FrameIO.ResumeCache();
         }

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

@@ -84 +84 @@
                         } catch (Exception e) {
                                 //TODO tell the user that there was a problem creating the profile frame and close nicely
+                                e.printStackTrace();
                                 assert(false);
                         }

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

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

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

@@ -727 +727 @@
 
         public static Frame CreateNewProfile(String username) throws Exception {
-                Frame profile = CreateFrameset(username, PROFILE_PATH);
+                Frame profile = CreateFrameset(username, PROFILE_PATH, true);
                 FrameUtils.CreateDefaultProfile(profile);
                 return profile;

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

@@ -259 +259 @@
                 for (String s : _FrameEvents)
                         eventList.append(s + '\n');
-                eventList.deleteCharAt(eventList.length() - 1);
+                if (eventList.length() > 0)
+                        eventList.deleteCharAt(eventList.length() - 1);
                 return eventList.toString();
         }