Changeset 348

Timestamp:

10/06/08 14:16:30 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Mail.java (modified) (2 diffs)
• agents/mail/MailSession.java (modified) (5 diffs)
• gui/AttributeUtils.java (modified) (7 diffs)
• gui/Browser.java (modified) (6 diffs)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/Frame.java (modified) (2 diffs)
• gui/FrameGraphics.java (modified) (7 diffs)
• gui/FrameIO.java (modified) (9 diffs)
• gui/FrameKeyboardActions.java (modified) (13 diffs)
• gui/FrameMouseActions.java (modified) (7 diffs)
• gui/FrameUtils.java (modified) (11 diffs)
• gui/Reminders.java (modified) (1 diff)
• gui/UserSettings.java (modified) (2 diffs)
• io/AbstractHTMLWriter.java (modified) (2 diffs)
• io/DefaultFrameWriter.java (modified) (3 diffs)
• io/ExpReader.java (modified) (1 diff)
• io/ExpWriter.java (modified) (7 diffs)
• io/FrameReader.java (modified) (3 diffs)
• io/KMSReader.java (modified) (1 diff)
• io/KMSWriter.java (modified) (2 diffs)
• io/Logger.java (modified) (1 diff)
• io/PDF2Writer.java (modified) (1 diff)
• io/PDFWriter.java (modified) (1 diff)
• io/PdfFramesetWriter.java (modified) (1 diff)
• items/Item.java (modified) (5 diffs)
• items/Justification.java (modified) (1 diff)
• items/Text.java (modified) (7 diffs)
• simple/Context.java (modified) (2 diffs)
• stats/StatsLogger.java (modified) (2 diffs)

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

@@ -79 +79 @@
         }
 
-        public static Text getMail(int messageNo) {
+        public static Text getMail(int firstMessage, int lastMessage) {
+                // Swap message numbers if they are around the wrong way
+                if (firstMessage > lastMessage) {
+                        int temp = firstMessage;
+                        firstMessage = lastMessage;
+                        lastMessage = temp;
+                }
+
+                MessageBay.errorMessage("Not yet supported");
+
+                return null;
+        }
+        
+        public static Collection<Text> getMail(int count) {
+                return getMail(null, null, count);
+        }
+
+        public static Text getMailByID(int messageNo) {
                 Text mailItem = MailSession.getInstance().getMail(
                                 DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition(),
@@ -85 +102 @@
                 // MessageBay.displayMessage(mailItems.size() + " messages read",
                 // Color.green);
+                if (mailItem == null) {
+                        MessageBay
+                                        .errorMessage("Mail message does not exist: " + messageNo);
+                }
 
                 return mailItem;

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -190 +190 @@
                                                 try {
                                                         MessageBay.displayMessage("New mail message!",
-                                                                        null, Color.green, true, "getMail "
+                                                                        null, Color.green, true, "getMailByID "
                                                                                         + _folder.getMessageCount());
+                                                        /*
+                                                         * TODO use messageID incase mail gets deleted
+                                                         * externally
+                                                         */
                                                 } catch (MessagingException e1) {
                                                         e1.printStackTrace();
@@ -444 +448 @@
                         msgs = _folder.getMessages();
 
+                        // msgs[0].get
+
                         int messagesRead = 0;
 
@@ -456 +462 @@
                                                 point.y += newItem.getBoundsHeight();
                                                 messagesRead++;
+                                        } else {
+                                                newItem = null;
                                         }
                                 }
@@ -475 +483 @@
                         Message[] msgs = _folder.getMessages();
                         return readMessage(msgs[msgNum], msgNum + 1, frame, point);
-                } catch (MessagingException e) {
+                } catch (ArrayIndexOutOfBoundsException ae) {
+                        /*
+                         * Just return null... error message will be displayed in the
+                         * calling method
+                         */
+                } catch (Exception e) {
                         e.printStackTrace();
                 }
@@ -492 +505 @@
                                 try {
                                         String subject = message.getSubject();
-                                        source.setText(messageNo + ". " + subject);
+                                        source.setText(" " + messageNo + ". " + subject);
                                         // Create a frameCreator
                                         final FrameCreator frames = new FrameCreator(frame

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

@@ -70 +70 @@
                         _Ignore.add("p");
                         _Ignore.add("x");
-                        _Ignore.add("y");                       
+                        _Ignore.add("y");
 
                         _ExtractIgnore = new LinkedList<String>();
@@ -209 +209 @@
                                         "setGradientColor", pColor));
 
+                        _SetMethods.put("ga", Item.class.getMethod("setGradientAngle",
+                                        pInt));
+                        _SetMethods.put("gradientangle", Item.class.getMethod(
+                                        "setGradientAngle", pInt));
+
                         _SetMethods.put("fillpattern", Item.class.getMethod(
                                         "setFillPattern", pString));
@@ -263 +268 @@
                         _SetMethods.put("width", Text.class.getMethod("setWidth", pInt));
                         _SetMethods.put("w", Text.class.getMethod("setWidth", pInt));
-                        
+
                         _SetMethods.put("size", Item.class.getMethod("setSize", pFloat));
                         _SetMethods.put("s", Item.class.getMethod("setSize", pFloat));
@@ -355 +360 @@
                                                 if (((Float) o) < -0.0001)
                                                         continue;
-                                                //Null indicates default
+                                                // Null indicates default
                                                 o = Math.round((Float) o);
                                         } else if (o instanceof Double) {
@@ -446 +451 @@
                 return setAttribute(toSet, attribs, 1);
         }
-        
-        public static boolean setAttribute(Object toSet, Text attribs, int minAttributeLength) {
+
+        public static boolean setAttribute(Object toSet, Text attribs,
+                        int minAttributeLength) {
                 // error checking
                 if (toSet == null || attribs == null)
@@ -454 +460 @@
                 if (_Ignore == null)
                         initLists();
-                
-                //if(attribs.isAnnotation())
-                //      return false;
+
+                // if(attribs.isAnnotation())
+                // return false;
 
                 // get the list of attribute: value pairs
@@ -467 +473 @@
                 // loop through all attribute: value pairs
                 for (int i = 0; i < values.size(); i++) {
-                        AttributeValuePair avp = new AttributeValuePair(values.get(i), false);
+                        AttributeValuePair avp = new AttributeValuePair(values.get(i),
+                                        false);
 
                         // If the first is not an attribute value pair then dont do
                         // attrubute merging
-                        if (!avp.hasAttribute() || avp.getAttribute().length() < minAttributeLength)
+                        if (!avp.hasAttribute()
+                                        || avp.getAttribute().length() < minAttributeLength)
                                 return false;
 

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

@@ -14 +14 @@
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
+import java.io.File;
 import java.util.Collection;
+import java.util.LinkedList;
 
 import javax.swing.JFrame;
@@ -53 +55 @@
 
         public static Browser _theBrowser = null;
-        
+
         private MouseEventRouter _mouseEventRouter;
 
@@ -98 +100 @@
                 return getContentPane().getLocationOnScreen();
         }
-        
-        /**
-         * @return
-         *              The mouse event router used fot this browser.
-         *              Never null after browser constructed.
+
+        /**
+         * @return The mouse event router used fot this browser. Never null after
+         *         browser constructed.
          */
         public MouseEventRouter getMouseEventRouter() {
@@ -151 +152 @@
 
                 UserSettings.Init();
-                UserSettings.Username = FrameIO.ConvertToValidFramesetName(System
+                UserSettings.ProfileName = FrameIO.ConvertToValidFramesetName(System
                                 .getProperty("user.name"));
-                String userName = UserSettings.Username;
+                String userName = UserSettings.ProfileName;
+                UserSettings.UserName = UserSettings.ProfileName;
+
+                Frame profile = loadProfile(userName);
+
+                // Need to display errors once things have been init otherwise
+                // exceptions occur if there are more than four messages neededing to be
+                // displayed.
+
+                Frame defaultProfile = loadProfile(UserSettings.DEFAULT_PROFILE_NAME);
+
+                Collection<String> warningMessages = FrameUtils
+                                .ParseProfile(defaultProfile);
+
+                warningMessages.addAll(FrameUtils.ParseProfile(profile));
+
+                // set the layout to absolute layout for widgets
+                this.getContentPane().setLayout(new AbsoluteLayout());
+
+                _mouseEventRouter = new MouseEventRouter(getJMenuBar(),
+                                getContentPane());
+
+                // enable the glasspane-for capturing all mouse events
+                this.setGlassPane(_mouseEventRouter);
+
+                this.getGlassPane().setVisible(true);
+                this.getContentPane().setBackground(Color.white);
+                this.getContentPane().setFocusTraversalKeysEnabled(false);
+
+                addComponentListener(this);
+                pack();
+
+                // Reset windows to user specified size
+                // Must be done after initialising the content pane above!
+                setSizes(new Dimension(UserSettings.InitialWidth,
+                                UserSettings.InitialHeight));
+
+                /*
+                 * See Java bug ID 4016934. They say that window closed events are
+                 * called once the JFrame is disposed.
+                 */
+                setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+                // Expeditee handles its own repainting of AWT/Swing components
+                RepaintManager.setCurrentManager(ExpediteeRepaintManager.getInstance());
+
+                // Listen for save status to display during and after runtime
+                EntitySaveManager.getInstance().addSaveStateChangedEventListener(this);
+
+                String version = System.getProperty("java.version");
+
+                if (version.startsWith("1.6")) {
+                        // Set the drag and drop handler
+                        _version6 = true;
+                        setTransferHandler(FrameDNDTransferHandler.getInstance());
+                } else {
+                        System.out.println("Upgrade to Java 1.6 to enable drag and drop");
+                }
+
+                try {
+                        warningMessages.addAll(Actions.Init());
+
+                        DisplayIO.Init(this);
+                        // Set visible must be just after DisplayIO.Init for the message box
+                        // to
+                        // be the right size
+                        setVisible(true);
+
+                        setupGraphics();
+
+                        // required to accept TAB key
+                        setFocusTraversalKeysEnabled(false);
+
+                        // Must be loaded after setupGraphics if images are on the frame
+                        // Turn off XRay mode and load the first frame
+                        FrameGraphics.setMode(FrameGraphics.MODE_NORMAL, false);
+                        FrameUtils.loadFirstFrame(profile);
+                        DisplayIO.UpdateTitle();
+
+                        /*
+                         * I think this can be moved back up to the top of the Go method
+                         * now... It used to crash the program trying to print error
+                         * messages up the top
+                         */
+                        for (String message : warningMessages)
+                                MessageBay.warningMessage(message);
+
+                        this.getContentPane().addKeyListener(FrameKeyboardActions.getInstance());
+                        this.addKeyListener(FrameKeyboardActions.getInstance());
+
+                        _mouseEventRouter.addExpediteeMouseListener(FrameMouseActions
+                                        .getInstance());
+                        _mouseEventRouter.addExpediteeMouseMotionListener(FrameMouseActions
+                                        .getInstance());
+                        _mouseEventRouter.addExpediteeMouseWheelListener(FrameMouseActions
+                                        .getInstance());
+
+                        /*
+                         * Dont refresh for the profile frame otherwise error messages are
+                         * shown twice
+                         */
+                        if (!DisplayIO.getCurrentFrame().equals(profile))
+                                FrameKeyboardActions.Refresh();
+                        // setVisible(true);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        Logger.Log(e);
+                }
+        }
+
+        /**
+         * @param userName
+         * @return
+         */
+        private Frame loadProfile(String userName) {
                 Frame profile = FrameIO.LoadProfile(userName);
                 if (profile == null) {
@@ -165 +280 @@
                         }
                 }
-
-                // Need to display errors once things have been init otherwise
-                // exceptions occur if there are more than four messages neededing to be
-                // displayed.
-                Collection<String> warningMessages = FrameUtils.ParseProfile(profile);
-
-                // set the layout to absolute layout for widgets
-                this.getContentPane().setLayout(new AbsoluteLayout());
-                
-                _mouseEventRouter = new MouseEventRouter(getJMenuBar(), getContentPane());
-                
-                // enable the glasspane-for capturing all mouse events
-                this.setGlassPane(_mouseEventRouter);
-                
-                this.getGlassPane().setVisible(true);
-                this.getContentPane().setBackground(Color.white);
-                this.getContentPane().setFocusTraversalKeysEnabled(false);
-
-                addComponentListener(this);
-                pack();
-
-                // Reset windows to user specified size
-                // Must be done after initialising the content pane above!
-                setSizes(new Dimension(UserSettings.InitialWidth,
-                                UserSettings.InitialHeight));
-
-                // See java bug ID 4016934. They say that window closed events are
-                // called once the
-                // jframe is disposed.
-                setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-                // Expeditee handles its own repainting of AWT/Swing components
-                RepaintManager.setCurrentManager(ExpediteeRepaintManager.getInstance());
-
-                // Listen for save status to display during and after runtime
-                EntitySaveManager.getInstance().addSaveStateChangedEventListener(this);
-
-                String version = System.getProperty("java.version");
-
-                if (version.startsWith("1.6")) {
-                        // Set the drag and drop handler
-                        _version6 = true;
-                        setTransferHandler(FrameDNDTransferHandler.getInstance());
-                } else {
-                        System.out.println("Upgrade to Java 1.6 to enable drag and drop");
-                }
-
-                try {
-                        warningMessages.addAll(Actions.Init());
-
-                        DisplayIO.Init(this);
-                        // Set visible must be just after DisplayIO.Init for the message box
-                        // to
-                        // be the right size
-                        setVisible(true);
-
-                        setupGraphics();
-
-                        // required to accept TAB key
-                        setFocusTraversalKeysEnabled(false);
-
-                        // Must be loaded after setupGraphics if images are on the frame
-                        // Turn off XRay mode and load the first frame
-                        FrameGraphics.setMode(FrameGraphics.MODE_NORMAL, false);
-                        FrameUtils.loadFirstFrame(profile);
-                        DisplayIO.UpdateTitle();
-
-                        // I think this can be moved back up to the top of the Go method
-                        // now...
-                        // It used to crash the program trying to print error messages up
-                        // the top
-                        for (String message : warningMessages)
-                                MessageBay.warningMessage(message);
-
-                        this.getContentPane().addKeyListener(FrameKeyboardActions.getInstance());
-                        this.addKeyListener(FrameKeyboardActions.getInstance());
-                        
-                        _mouseEventRouter.addExpediteeMouseListener(FrameMouseActions.getInstance());
-                        _mouseEventRouter.addExpediteeMouseMotionListener(FrameMouseActions.getInstance());
-                        _mouseEventRouter.addExpediteeMouseWheelListener(FrameMouseActions.getInstance());
-
-                        FrameKeyboardActions.Refresh();
-                        // setVisible(true);
-                } catch (Exception e) {
-                        e.printStackTrace();
-                        Logger.Log(e);
-                }
+                return profile;
         }
 
@@ -455 +484 @@
                                         MessageBay.displayMessage("System exited");
 
-                                        //Finally remove the messages frameset
-                                        FrameIO.moveFrameset("messages",
-                                                        FrameIO.MESSAGES_PATH);
+                                        // Finally remove the messages frameset
+                                        FrameIO.moveFrameset("messages", FrameIO.MESSAGES_PATH);
+
+                                        /*
+                                         * Create a new messages folder so that it doesn't throw
+                                         * Exceptions when two Expeditee's open at once and the
+                                         * second tries to save its messages
+                                         */
+                                        File file = new File(FrameIO.MESSAGES_PATH + "messages");
+                                        file.mkdirs();
 
                                         System.exit(0);

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

@@ -71 +71 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp22Sep2008A";
+        public static final String TITLE = "Exp03Oct2008A";
 
         private DisplayIO() {
@@ -806 +806 @@
                 _Robot.keyRelease(key);
                 // _Robot.waitForIdle();
-                Thread.sleep(100);
+                Thread.sleep(200);
         }
 

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

@@ -999 +999 @@
                 s.append(String.format("Name: %s%d%n", _frameset, _number));
                 s.append(String.format("Version: %d%n", _version));
-                //s.append(String.format("Permission: %s%n", _permission.toString()));
-                //s.append(String.format("Owner: %s%n", _owner));
-                //s.append(String.format("Date Created: %s%n", _creationDate));
-                //s.append(String.format("Last Mod. User: %s%n", _modifiedUser));
-                //s.append(String.format("Last Mod. Date: %s%n", _modifiedDate));
+                // s.append(String.format("Permission: %s%n", _permission.toString()));
+                // s.append(String.format("Owner: %s%n", _owner));
+                // s.append(String.format("Date Created: %s%n", _creationDate));
+                // s.append(String.format("Last Mod. User: %s%n", _modifiedUser));
+                // s.append(String.format("Last Mod. Date: %s%n", _modifiedDate));
                 s.append(String.format("Items: %d%n", _body.size()));
                 return s.toString();
@@ -1455 +1455 @@
                 // t.setMaxWidth(FrameGraphics.getMaxFrameSize().width);
                 // if (t.getWidth() <= 0) {
-                t.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+//              String maxWidthString = getAnnotationValue("maxwidth");
+//              int width = FrameGraphics.getMaxFrameSize().width;
+//              if (maxWidthString != null) {
+//                      try {
+//                              width = Math.min(width, Integer.parseInt(maxWidthString));
+//                      } catch (NumberFormatException nfe) {
+//                      }
+//              }
+//
+//              t.setRightMargin(width);
                 // }
                 addItem(t);

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

@@ -8 +8 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
+import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -146 +147 @@
                         if (DisplayIO.isTwinFramesOn()) {
                                 Frame opposite = DisplayIO.getOppositeFrame();
-                                
-                                /*When running the test suite opposite may be null!*/
+
+                                /* When running the test suite opposite may be null! */
                                 if (opposite != null) {
-                                opposite.setBuffer(null);
-                                opposite.refreshSize();
+                                        opposite.setBuffer(null);
+                                        opposite.refreshSize();
                                 }
                         }
@@ -319 +320 @@
         public static void paintFrame(Frame toPaint, Area clip,
                         boolean isActualFrame, boolean createVolitile, Graphics2D bg) {
-                
+
                 // Prepare render passes
                 if (isActualFrame) {
@@ -328 +329 @@
                         }
                 }
-                
+
                 bg.setClip(clip);
 
@@ -671 +672 @@
                                 int cmp = aArea.compareTo(bArea);
                                 if (cmp == 0) {
-                                        // System.out.println(a.getEnclosureID() + " " + b.getID());
-                                        return new Integer(a.getEnclosureID()).compareTo(b
-                                                        .getEnclosureID());
+                                        // System.out.println(a.getEnclosureID() + " " +
+                                        // b.getID());\
+                                        //Shapes to the left go underneath
+                                        Polygon pA = a.getEnclosedShape();
+                                        Polygon pB = b.getEnclosedShape();
+                                        if(pA == null || pB == null)
+                                                return 0;
+                                        return new Integer(pA.getBounds().x)
+                                                        .compareTo(pB.getBounds().x);
                                 }
                                 return cmp * -1;
@@ -920 +927 @@
                                 damagedAreas.clear();
                         }
-                        //System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
+                        // System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
                 }
 
@@ -1032 +1039 @@
          */
         public interface FrameRenderPass {
-                
+
                 /**
                  * 
                  * @param currentClip
                  * 
-                 * @return
-                 *              The clip that the pass should use instead.
-                 *              i.e. if there are any effects that cannot invladate prior to paint call.
+                 * @return The clip that the pass should use instead. i.e. if there are
+                 *         any effects that cannot invladate prior to paint call.
                  */
                 Area paintStarted(Area currentClip);
-                
+
                 void paintFinalPass(Graphics g);
-                
+
                 void paintPreLayeredPanePass(Graphics g);
         }

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -10 +11 @@
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.sql.Time;
 import java.util.Collection;
@@ -653 +657 @@
                                 + template.getName() + " from TDFC");
 
-                template.setOwner(UserSettings.Username);
+                template.setOwner(UserSettings.UserName);
                 template.resetDateCreated();
                 for (Item i : template.getItems()) {
@@ -664 +668 @@
 
                 if (!DisplayIO.isTwinFramesOn()) {
-                        // BROOK: This had recursion!! Changed to avoid...
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
-                                while (titleItem.getBoundsWidth() + titleItem.getX() > template
+                                while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE && titleItem.getBoundsWidth() + titleItem.getX() > template
                                                 .getNameItem().getX()) {
                                         titleItem.setSize(titleItem.getSize() - 1);
+                                        
                                 }
                         } else {
@@ -832 +836 @@
                                 savedVersion = KMSReader.getVersion(fullPath);
                         }
+
+                        // 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;
+//                      }
+
                         // Check if we are trying to save an out of date version
                         if (savedVersion > toSave.getVersion()
@@ -944 +962 @@
                 if (toCheck.getNumber() == 0)
                         return false;
-                return toCheck.getFramesetName()
-                                .equalsIgnoreCase(UserSettings.Username);
+                return toCheck.getPath().equals(PROFILE_PATH);
+                //return toCheck.getFramesetName()
+                //              .equalsIgnoreCase(UserSettings.ProfileName);
         }
 
@@ -954 +973 @@
         public static Frame CreateNewProfile(String username) throws Exception {
                 Frame profile = CreateFrameset(username, PROFILE_PATH, true);
-                FrameUtils.CreateDefaultProfile(profile);
+                FrameUtils.CreateDefaultProfile(username, profile);
                 return profile;
         }
@@ -1445 +1464 @@
                 // Save the new version
                 try {
-                        FileWriter fw = new FileWriter(file);
+                        // FileWriter fw = new FileWriter(file);
+
+                        // Open an Output Stream Writer to set encoding
+                        OutputStream fout = new FileOutputStream(file);
+                        OutputStream bout = new BufferedOutputStream(fout);
+                        Writer fw = new OutputStreamWriter(bout, "UTF-8");
+
                         String nextLine = null;
                         while ((nextLine = packetContents.readLine()) != null) {
@@ -1470 +1495 @@
         public static void setSavedProperties(Frame toSave) {
                 toSave.setLastModifyDate(Logger.EasyDateFormat("ddMMMyyyy:HHmm"));
-                toSave.setLastModifyUser(UserSettings.Username);
+                toSave.setLastModifyUser(UserSettings.UserName);
                 toSave.setVersion(toSave.getVersion() + 1);
                 Time darkTime = new Time(SessionStats.getFrameDarkTime().getTime()

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

@@ -219 +219 @@
                 } else {
                         text.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+
+                        // Check for the annotation that restricts the width of text items
+                        // on the frame
+                        String widthString;
+                        if ((widthString = text.getParentOrCurrentFrame()
+                                        .getAnnotationValue("maxwidth")) != null) {
+                                try {
+                                        int width = text.getWidth();
+                                        int maxWidth = Integer.parseInt(widthString);
+                                        if (maxWidth < width)
+                                                text.setWidth(maxWidth);
+                                } catch (NumberFormatException nfe) {
+                                }
+                        }
                 }
         }
@@ -912 +926 @@
                         break;
                 case KeyEvent.VK_S:
+                        /*
+                         * Only split when shift is down... it is too easy to accidentally
+                         * hit Ctrl+S after completing a paragraph because this is the
+                         * shortcut for saving a document in most word processors and text
+                         * editors!
+                         * 
+                         */
+                        if (!isShiftDown){
+                                Save();
+                                return;
+                        }
                         Text text2 = getCurrentTextItem();
                         // split the current text item
@@ -1009 +1034 @@
                                                 Rectangle rect = firstConnected.getEnclosedShape()
                                                                 .getBounds();
-                                                DisplayIO.setCursorPosition(rect.x + Text.MARGIN_LEFT,
-                                                                Text.MARGIN_LEFT
-                                                                                + rect.y
-                                                                                + DisplayIO.getCurrentFrame()
-                                                                                                .getItemTemplate()
-                                                                                                .getBoundsHeight());
+                                                int newX = rect.x + Text.MARGIN_LEFT;
+                                                int newY = Text.MARGIN_LEFT
+                                                                + rect.y
+                                                                + DisplayIO.getCurrentFrame().getItemTemplate()
+                                                                                .getBoundsHeight();
+                                                moveCursorAndFreeItems(newX, newY);
+                                                // TODO can resetOffset be put inside
+                                                // moveCursorAndFreeItems
+                                                FrameMouseActions.resetOffset();
                                         }
                                         break;
@@ -1259 +1287 @@
 
                                 dummyItem.setPosition(xPos, yPos);
-                                DisplayIO.setCursorPosition(xPos, yPos);
+                                // DisplayIO.setCursorPosition(xPos, yPos);
+
+                                checkMovingCursor(dummyItem);
                         } else {
                                 int yPos = column.get(0).getY() + 1;
+                                int xPos = column.get(0).getX();
                                 // Either position the new item below the title or just above
                                 // the first item below the title
-                                if (toDropFrom == title && column.get(0) != title)
-                                        yPos = Math.min(column.get(0).getY() - 1, title.getY()
-                                                        + title.getBoundsHeight()
-                                                        + dummyItem.getBoundsHeight());
-                                dummyItem.setPosition(column.get(0).getX(), yPos);
+                                if (toDropFrom == title && column.get(0) != title) {
+                                        // If dropping from the title position just above top item
+                                        yPos = column.get(0).getY() - 1;
+
+                                        Frame current = DisplayIO.getCurrentFrame();
+                                        // Check for @start on the zero frame
+                                        Frame zero = FrameIO
+                                                        .LoadFrame(current.getFramesetName() + '0');
+                                        Text start = zero.getAnnotation("start");
+                                        if (start != null) {
+                                                yPos = Math.min(yPos, start.getY());
+                                        }
+                                }
+                                dummyItem.setPosition(xPos, yPos);
                                 column.add(dummyItem);
                                 FrameUtils.Align(column, false, 0);
@@ -1336 +1376 @@
                                 }
 
-                                // Move the item to the cursor position
-                                if (FreeItems.itemsAttachedToCursor()) {
-                                        DisplayIO.setCursorPosition(dummyItem.getX(), dummyItem
-                                                        .getY());
-                                        Item firstItem = FreeItems.getItemAttachedToCursor();
-                                        int deltaX = firstItem.getX() - dummyItem.getX();
-                                        int deltaY = firstItem.getY() - dummyItem.getY();
-
-                                        for (Item i : FreeItems.getInstance()) {
-                                                i.setPosition(i.getX() - deltaX, i.getY() - deltaY);
-                                        }
-                                } else {
-                                        DisplayIO.MoveCursorToEndOfItem(dummyItem);
-                                }
+                                checkMovingCursor(dummyItem);
                         }
                         if (dummyItem.getText().length() == 0
@@ -1367 +1394 @@
                 }
                 return true;
+        }
+
+        /**
+         * @param dummyItem
+         */
+        private static void checkMovingCursor(Text dummyItem) {
+                // Move the item to the cursor position
+                if (FreeItems.itemsAttachedToCursor()) {
+                        moveCursorAndFreeItems(dummyItem.getX(), dummyItem.getY());
+                } else {
+                        DisplayIO.MoveCursorToEndOfItem(dummyItem);
+                }
+        }
+
+        /**
+         * @param dummyItem
+         */
+        public static void moveCursorAndFreeItems(int x, int y) {
+                DisplayIO.setCursorPosition(x, y);
+                Item firstItem = FreeItems.getItemAttachedToCursor();
+                int deltaX = firstItem.getX() - x;
+                int deltaY = firstItem.getY() - y;
+
+                for (Item i : FreeItems.getInstance()) {
+                        i.setPosition(i.getX() - deltaX, i.getY() - deltaY);
+                }
         }
 
@@ -1590 +1643 @@
                                 toSize.addAll(toSet.getLines());
                         } else if (toSet instanceof Line) {
-                                
+
                                 Line line = (Line) toSet;
-                                
-                                if (!(toSet instanceof WidgetEdge) || ((WidgetEdge)toSet).getWidgetSource().isWidgetEdgeThicknessAdjustable()) {
+
+                                if (!(toSet instanceof WidgetEdge)
+                                                || ((WidgetEdge) toSet).getWidgetSource()
+                                                                .isWidgetEdgeThicknessAdjustable()) {
 
                                         float current = Math.abs(line.getThickness());
@@ -1600 +1655 @@
                                         FrameGraphics.Repaint();
                                         return;
-        
-                                }
-                                
+
+                                }
+
                         } else {
                                 toSize.add(toSet);
@@ -1620 +1675 @@
 
                                 if (i.isLineEnd()) {
-                                        
-                                        if (!(i instanceof WidgetCorner) || !((WidgetCorner)i).getWidgetSource().isFixedSize()) { // don't size fixed widgets
-                                                
+
+                                        if (!(i instanceof WidgetCorner)
+                                                        || !((WidgetCorner) i).getWidgetSource()
+                                                                        .isFixedSize()) { // don't size fixed
+                                                // widgets
+
                                                 Collection<Item> allConnected = i.getAllConnected();
                                                 done.addAll(allConnected);
                                                 for (Item it : allConnected) {
                                                         it.translate(origin, ratio);
-                                                        it
-                                                                        .setArrowheadLength((float) (it
-                                                                                        .getArrowheadLength() * ratio));
+                                                        it.setArrowheadLength((float) (it
+                                                                        .getArrowheadLength() * ratio));
                                                 }
                                                 i.setThickness((float) (i.getThickness() * ratio));
@@ -1638 +1695 @@
                                         // Ensure that the source is done before the XRayable
                                         if (!done.contains(source)) {
-                                                scaleText(origin, ratio, done, source);
+                                                scaleText(insideEnclosure, origin, ratio, done, source);
                                         }
 
@@ -1662 +1719 @@
                                         item.getParent().parse();
                                 } else if (i instanceof Text) {
-                                        scaleText(origin, ratio, done, (Text) i);
+                                        scaleText(insideEnclosure, origin, ratio, done, (Text) i);
                                 }
                         }
@@ -1727 +1784 @@
          * @param source
          */
-        private static void scaleText(Point2D origin, double ratio,
+        private static void scaleText(boolean insideEnclosure, Point2D origin, double ratio,
                         Collection<Item> done, Text source) {
+                if(insideEnclosure)
+                        source.setWidth(Math.round((float) (source.getWidth() * ratio)));
                 source.translate(origin, ratio);
                 source.setSize((float) (source.getSize() * ratio));
@@ -2117 +2176 @@
         public static void Refresh() {
                 Frame currentFrame = DisplayIO.getCurrentFrame();
-                
-                //Refresh widgets that use its self as a data source
+
+                // Refresh widgets that use its self as a data source
                 currentFrame.notifyObservers();
-                
+
                 if (FrameIO.isProfileFrame(currentFrame)) {
                         // TODO ensure that users can not delete the first frame in a

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

@@ -649 +649 @@
                 if (clicked instanceof Text) {
                         Text text = (Text) clicked;
-                        /*Dont follow link when just highlighting text with the left button*/
+                        /* Dont follow link when just highlighting text with the left button */
                         if (text.getText().length() == 0)
                                 clicked = null;
-                        else if (text.getSelectionSize() > 0){
+                        else if (text.getSelectionSize() > 0) {
                                 return;
                         }
@@ -689 +689 @@
                 if (clicked != null) {
                         // check item permissions
-                        if (!clicked.hasPermission(Permission.followLinks)) {
+                        if ((clicked.hasLink() && !clicked
+                                        .hasPermission(Permission.followLinks))
+                                        || (!clicked.hasLink() && !clicked
+                                                        .hasPermission(Permission.createFrames))) {
                                 Item editTarget = clicked.getEditTarget();
                                 if (editTarget != clicked
@@ -1609 +1612 @@
         private void mouseMoved(MouseEvent e, boolean shiftStateChanged) {
 
-                //System.out.println(_context);
+                // System.out.println(_context);
                 if (_context == CONTEXT_FREESPACE)
                         FrameKeyboardActions.resetEnclosedItems();
@@ -2043 +2046 @@
                 // around it
                 String text = linker.getText();
-                if (text.equals("@v") || text.equals("@f")) {
+                boolean isVector = text.equals("@v") || text.equals("@av");
+
+                if (isVector || text.equals("@f")) {
                         Collection<Item> enclosure = FrameUtils.getEnclosingLineEnds(linker
                                         .getPosition());
@@ -2049 +2054 @@
                                 for (Item i : enclosure) {
                                         if (i.isLineEnd() && i.isEnclosed()) {
-                                                DisplayIO.getCurrentFrame().removeAllItems(enclosure);
+                                                if (!isVector)
+                                                        DisplayIO.getCurrentFrame().removeAllItems(
+                                                                        enclosure);
                                                 Rectangle rect = i.getEnclosedRectangle();
                                                 long width = Math.round(rect.getWidth());
-                                                if (text.equals("@v")) {
+                                                if (isVector) {
                                                         NumberFormat nf = Vector.getNumberFormatter();
-                                                        linker.setText("@v: "
+                                                        linker.setText(linker.getText()
+                                                                        + ": "
                                                                         + nf.format((width / FrameGraphics
                                                                                         .getMaxFrameSize().getWidth())));
@@ -2067 +2075 @@
                                         }
                                 }
-                                FrameMouseActions.deleteItems(enclosure, false);
+                                if (!isVector)
+                                        FrameMouseActions.deleteItems(enclosure, false);
                         }
                 }
@@ -2983 +2992 @@
                 return new Point(getX(), getY());
         }
-        
+
         public static Point getFreeItemsOffset() {
                 return new Point(_offX, _offY);

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

@@ -54 +54 @@
         public static int MINIMUM_INTERITEM_SPACING = -6;
 
+        public static Double MAXIMUM_SPACING_RATIO = null;
+
+        public static Double MINIMUM_SPACING_RATIO = null;
+
         public static float getResponseTimeTotal() {
                 return _ResponseTimeSum;
@@ -148 +152 @@
                 Collections.sort(toAlign);
 
-                // Single items dont need alignment
-                if (toAlign.size() < 2)
+                /*
+                 * Single items dont need alignment But if there are two items we may
+                 * still want to format them... ie if they are too close together.
+                 */
+                if (toAlign.size() < 1)
                         return 0;
 
@@ -215 +222 @@
                         if (space < MINIMUM_INTERITEM_SPACING)
                                 space = MINIMUM_INTERITEM_SPACING;
+
+                        if (MAXIMUM_SPACING_RATIO != null) {
+                                double maxSpace = MAXIMUM_SPACING_RATIO * above.getSize();
+                                if (maxSpace < space) {
+                                        space = (int) Math.round(maxSpace);
+                                }
+                        }
+
+                        if (MINIMUM_SPACING_RATIO != null) {
+                                double minSpace = MINIMUM_SPACING_RATIO * above.getSize();
+                                if (minSpace > space) {
+                                        space = (int) Math.round(minSpace);
+                                }
+                        }
 
                         if (above != curr.getNameItem() && above != curr.getTitleItem())
@@ -451 +472 @@
 
         public static void DisplayProfileFrame() {
-                DisplayFrame(UserSettings.Username + '1');
+                DisplayFrame(UserSettings.ProfileName + '1');
         }
 
@@ -576 +597 @@
                                         UserSettings.HomeFrame = profile.getName();
                                 }
-                        } else if (attribute.equals("menuframe"))
-                                UserSettings.MenuFrame = getLink(item, UserSettings.MenuFrame);
-                        else if (attribute.equals("defaultframe"))
+                        } else if (attribute.equals("username")) {
+                                UserSettings.UserName = avp.getValue();
+                        } else if (attribute.equals("defaultframe"))
                                 UserSettings.DefaultFrame = getLink(item,
                                                 UserSettings.DefaultFrame);
@@ -599 +620 @@
                         else if (attribute.equals("noopthreshold"))
                                 UserSettings.NoOpThreshold = avp.getIntegerValue();
-                        else if (attribute.equals("initialwidth")) {
+                        else if (attribute.equals("formatspacingmin")) {
+                                FrameUtils.MINIMUM_SPACING_RATIO = avp.getDoubleValue();
+                        } else if (attribute.equals("formatspacingmax")) {
+                                FrameUtils.MAXIMUM_SPACING_RATIO = avp.getDoubleValue();
+                        } else if (attribute.equals("initialwidth")) {
                                 UserSettings.InitialWidth = avp.getIntegerValue();
                         } else if (attribute.equals("initialheight")) {
@@ -670 +695 @@
         }
 
+        /**
+         * Sets the first frame to be displayed.
+         * 
+         * @param profile
+         */
         public static void loadFirstFrame(Frame profile) {
                 if (UserSettings.HomeFrame == null)
                         UserSettings.HomeFrame = profile.getName();
-                // else {
+
                 Frame firstFrame = FrameIO.LoadFrame(UserSettings.HomeFrame);
                 if (firstFrame == null) {
@@ -683 +713 @@
                         DisplayIO.setCurrentFrame(firstFrame, true);
                 }
-                // }
+
         }
 
@@ -1363 +1393 @@
          * Fills the given Frame with default profile tags
          */
-        public static void CreateDefaultProfile(Frame profile) {
+        public static void CreateDefaultProfile(String username, Frame profile) {
                 Text title = profile.getTitleItem();
-                title.setText("Profile Frame");
+                if(username.equals(UserSettings.DEFAULT_PROFILE_NAME)){
+                        title.setText("Default Profile Frame");
+                }else{
+                        title.setText(username + "'s Profile Frame");
+                }
                 title.setSize(50);
                 title.setFontStyle("Bold");
@@ -1378 +1412 @@
 
                 yPos += spacing;
-                profile.addText(xPos, yPos, "HomeFrame: " + profile.getName(), null,
+                profile.addText(xPos, yPos, "@HomeFrame: " + profile.getName(), null,
                                 profile.getName());
                 yPos += spacing;
                 String defaultFrameName = profile.getFramesetName() + "0";
-                profile.addText(xPos, yPos, "DefaultFrame: " + defaultFrameName, null,
+                profile.addText(xPos, yPos, "@DefaultFrame: " + defaultFrameName, null,
                                 defaultFrameName);
                 yPos += spacing;
 
-                profile.addText(xPos, yPos, "InitialWidth: "
+                profile.addText(xPos, yPos, "@InitialWidth: "
                                 + UserSettings.InitialWidth, null);
                 yPos += spacing;
 
-                profile.addText(xPos, yPos, "InitialHeight: "
+                profile.addText(xPos, yPos, "@InitialHeight: "
                                 + UserSettings.InitialHeight, null);
                 yPos += spacing;
 
-                Text t = profile.addText(xPos, yPos, "ItemTemplate", null);
+                Text t = profile.addText(xPos, yPos, "@ItemTemplate", null);
                 t.setColor(null);
 
                 yPos += spacing;
-                t = profile.addText(xPos, yPos, "AnnotationTemplate", null);
+                t = profile.addText(xPos, yPos, "@AnnotationTemplate", null);
                 t.setColor(Color.gray);
 
                 yPos += spacing;
-                t = profile.addText(xPos, yPos, "CommentTemplate", null);
+                t = profile.addText(xPos, yPos, "@CommentTemplate", null);
                 t.setColor(Color.green.darker());
 
                 yPos += spacing;
-                t = profile.addText(xPos, yPos, "StatsTemplate", null);
+                t = profile.addText(xPos, yPos, "@StatsTemplate", null);
                 t.setColor(Color.BLACK);
                 t.setBackgroundColor(new Color(0.9F, 0.9F, 0.9F));
@@ -1413 +1447 @@
 
                 xPos = 600;
-                yPos = intialYPos;
+                yPos = intialYPos + spacing;
 
                 // Iterate through the help folder and add links

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

@@ -58 +58 @@
                                                                 _alertsRunning--;
                                                                 reminderItem.setText("@" + reminderItem.getText());
+                                                                FrameIO.ForceSaveFrame(reminderItem.getParent());
                                                                 if (_alertsRunning == 0) {
                                                                         _bStop = false;

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

@@ -14 +14 @@
  */
 public abstract class UserSettings {
+        
+        public final static String DEFAULT_PROFILE_NAME = "default";
 
         public static List<Text> Style = new LinkedList<Text>();;
@@ -31 +33 @@
         public static int InitialHeight = 768;
         
-        public static String Username;
-
+        public static String ProfileName;
+        
+        public static String UserName;
+        
         public static String DefaultFrame = null;
 

trunk/src/org/expeditee/io/AbstractHTMLWriter.java

@@ -26 +26 @@
                 _writer.write("<html>" + ItemWriter.NEW_LINE);
                 _writer.write("<head>" + ItemWriter.NEW_LINE);
+                _writer
+                                .write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">");
                 _writer.write("<title>" + start.getTitle());
                 _writer.write("</title>" + ItemWriter.NEW_LINE);
@@ -59 +61 @@
                                 + Conversion.getCssFontFamily(font.getFamily()));
 
-                //writer.write("; font-size: " + Math.round(style.getSize()) + "px");
-                
+                // writer.write("; font-size: " + Math.round(style.getSize()) + "px");
+
                 if (font.isBold()) {
                         writer.write("; font-weight: bold");

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -2 +2 @@
 
 import java.awt.Desktop;
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.lang.reflect.Method;
@@ -87 +90 @@
                         _ItemTags.put("e", Item.class.getMethod("getFillColor", param));
                         _ItemTags.put("E", Item.class.getMethod("getGradientColor", param));
+                        _ItemTags.put("Q", Item.class.getMethod("getGradientAngle", param));
 
                         _ItemTags.put("i", Item.class.getMethod("getFillPattern", param));
@@ -198 +202 @@
                         File test = new File(_filename);
 
-                        test = test.getParentFile();
-                        if (test != null && !test.exists()) {
-                                test.mkdirs();
-                        }
-
-                        _writer = new ProxyWriter(new FileWriter(_filename));
+                        File parent = test.getParentFile();
+                        if (parent != null && !parent.exists()) {
+                                parent.mkdirs();
+                        }
+
+                        // Open an Output Stream Writer to set encoding
+                        OutputStream fout = new FileOutputStream(_filename);
+                        OutputStream bout = new BufferedOutputStream(fout);
+                        Writer out = new OutputStreamWriter(bout, "UTF-8");
+
+                        _writer = new ProxyWriter(out);
                         _output = _filename;
                 }

trunk/src/org/expeditee/io/ExpReader.java

@@ -271 +271 @@
                 } catch (Exception e) {
                 }
-                return 0;
+                return -1;
         }
 }

trunk/src/org/expeditee/io/ExpWriter.java

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.lang.reflect.Method;
@@ -12 +15 @@
 import org.expeditee.agents.DefaultAgent;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Item;
@@ -45 +49 @@
 
                 _stringWriter = new StringBuilder();
-                
-                
-                if (writer != null){
+
+                if (writer != null) {
                         _writer = new ProxyWriter(writer);
                         _output = writer.toString();
-                }else if (_filename.equalsIgnoreCase(DefaultAgent.CLIPBOARD)) {
+                } else if (_filename.equalsIgnoreCase(DefaultAgent.CLIPBOARD)) {
                         _writer = new ProxyWriter(true);
                         _filename = DefaultAgent.CLIPBOARD;
-                } else
-                        _writer = new ProxyWriter(new FileWriter(_filename));
-                
-                
-                
+                } else {
+                        // Open an Output Stream Writer to set encoding
+                        OutputStream fout = new FileOutputStream(_filename);
+                        OutputStream bout = new BufferedOutputStream(fout);
+                        Writer out = new OutputStreamWriter(bout, "UTF-8");
+
+                        _writer = new ProxyWriter(out);
+                }
+
                 try {
                         _FrameTags.remove("A");
-                        _ItemTags.put("S", Item.class.getMethod("getTypeAndID", new Class[] {}));
+                        _ItemTags.put("S", Item.class.getMethod("getTypeAndID",
+                                        new Class[] {}));
                 } catch (Exception e) {
 
@@ -67 +75 @@
 
         /**
-         * Writes the given Frame (and all items it contains) to a Expeditee file. Note:
-         * File path and location must be set before calling this or it will do
-         * nothing.
+         * Writes the given Frame (and all items it contains) to a Expeditee file.
+         * Note: File path and location must be set before calling this or it will
+         * do nothing.
          * 
          * @param frame
@@ -82 +90 @@
                 writeHeader(frame);
 
-
                 // write each item in the frame
                 for (Item i : frame.getItemsToSave()) {
-                        assert(!(i instanceof Line));
+                        assert (!(i instanceof Line));
                         writeItem(i);
                 }
@@ -96 +103 @@
                 writeTerminator();
                 writeLine(SessionStats.getFrameEventList(frame));
-                
+
                 return;
         }
@@ -139 +146 @@
                 _stringWriter.append(toWrite);
         }
-        
+
         // writes the given Item out to the file
         // This method is not used to write out LINE items

trunk/src/org/expeditee/io/FrameReader.java

@@ -5 +5 @@
 import java.awt.Point;
 import java.io.BufferedReader;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.lang.reflect.Method;
 import java.util.LinkedHashMap;
@@ -93 +96 @@
                         _ItemTags.put('e', Item.class.getMethod("setFillColor", pColor));
                         _ItemTags.put('E', Item.class.getMethod("setGradientColor", pColor));
+                        _ItemTags.put('Q', Item.class.getMethod("setGradientAngle", pInt));
+                        
                         _ItemTags.put('i', Item.class.getMethod("setFillPattern", pString));
                         _ItemTags.put('o', Item.class.getMethod("setOwner", pString));
@@ -129 +134 @@
         
         public Frame readFrame(String fullPath) throws IOException {
-                return readFrame(new BufferedReader(new FileReader(fullPath)));
+                Reader in = new InputStreamReader(new FileInputStream(fullPath), "UTF-8");
+                return readFrame(new BufferedReader(in));
         }
         

trunk/src/org/expeditee/io/KMSReader.java

@@ -550 +550 @@
                 } catch (Exception e) {
                 }
-                return 0;
+                return -1;
         }
 }

trunk/src/org/expeditee/io/KMSWriter.java

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
@@ -50 +54 @@
                         _writer = new ProxyWriter(true);
                         _filename = DefaultAgent.CLIPBOARD;
-                } else
-                        _writer = new ProxyWriter(new FileWriter(_filename));
-
+                } else{
+//                       Open an Output Stream Writer to set encoding
+                        OutputStream fout = new FileOutputStream(_filename);
+                        OutputStream bout = new BufferedOutputStream(fout);
+                        Writer out = new OutputStreamWriter(bout, "UTF-8");
+                        _writer = new ProxyWriter(out);
+                }
+                
                 try {
                         _FrameTags.put("A", Frame.class.getMethod("getName", new Class[] {}));

trunk/src/org/expeditee/io/Logger.java

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.sql.Time;
 import java.text.SimpleDateFormat;

trunk/src/org/expeditee/io/PDF2Writer.java

@@ -49 +49 @@
                         _pdfDocument.open();
                         _pdfDocument.addCreationDate();
-                        _pdfDocument.addAuthor(UserSettings.Username);
+                        _pdfDocument.addAuthor(UserSettings.UserName);
                         _pdfDocument.addCreator("Expeditee");
                 } catch (DocumentException e) {

trunk/src/org/expeditee/io/PDFWriter.java

@@ -52 +52 @@
                         _pdfDocument.open();
                         _pdfDocument.addCreationDate();
-                        _pdfDocument.addAuthor(UserSettings.Username);
+                        _pdfDocument.addAuthor(UserSettings.UserName);
                         _pdfDocument.addCreator("Expeditee");
                         _pdfDocument.addTitle(start.getTitle());

trunk/src/org/expeditee/io/PdfFramesetWriter.java

@@ -72 +72 @@
                         _pdfDocument.open();
                         _pdfDocument.addCreationDate();
-                        _pdfDocument.addAuthor(UserSettings.Username);
+                        _pdfDocument.addAuthor(UserSettings.UserName);
                         _pdfDocument.addCreator("Expeditee");
                 } catch (DocumentException e) {

trunk/src/org/expeditee/items/Item.java

@@ -74 +74 @@
         protected boolean _connectedToAnnotation = false;
 
+        private int _gradientAngle = 0;
+
         public static final int NEAR_DISTANCE = 15;
 
@@ -162 +164 @@
                 dest.setFillColor(source.getFillColor());
                 dest.setGradientColor(source.getGradientColor());
+                dest.setGradientAngle(source.getGradientAngle());
                 dest.setFillPattern(source.getFillPattern());
 
@@ -182 +185 @@
                 dest.setArrow(source.getArrowheadLength(), source.getArrowheadRatio());
 
-                // Calling the methods will move the item...
-                // This messes things up when the user uses backspace to delete a text
-                // line end
+                /*
+                 * Calling the methods will move the item... This messes things up when
+                 * the user uses backspace to delete a text line end
+                 */
                 dest._anchorBottom = source._anchorBottom;
                 dest._anchorRight = source._anchorRight;
@@ -206 +210 @@
                 // dest.setID(source.getID());
                 // }
+        }
+
+        public void setGradientAngle(int gradientAngle) {
+                _gradientAngle = gradientAngle;
+
+                for (Line line : _lines) {
+                        Item other = line.getOppositeEnd(this);
+                        if (other.getGradientAngle() != gradientAngle)
+                                other.setGradientAngle(gradientAngle);
+                }
+
+                invalidateCommonTrait(ItemAppearence.GradientColor);
+                invalidateFill();
+        }
+
+        public int getGradientAngle() {
+                return _gradientAngle;
         }
 
@@ -1054 +1075 @@
                 Color gradientColor = getGradientColor();
                 if (gradientColor != null) {
-                        // The painting is not efficient enough for gradients...
+                        /*
+                         * It is slow when painting gradients... modify so this is only done
+                         * once unless it is resized...
+                         */
                         Shape s = getEnclosedShape();
                         if (s != null) {
                                 Rectangle b = s.getBounds();
-                                GradientPaint gp = new GradientPaint(
-                                                (int) (b.x + b.width * 0.3), b.y, fillColor,
-                                                (int) (b.x + b.width * 1.3), b.y, gradientColor);
+                                double rads = getGradientAngle() * Math.PI / 180;
+                                double cos = Math.cos(rads);
+                                double sin = Math.sin(rads);
+
+                                GradientPaint gp = new GradientPaint((int) (b.x + b.width
+                                                * (0.2 * cos + 0.5)), (int) (b.y + b.height
+                                                * (0.2 * sin + 0.5)), fillColor, (int) (b.x + b.width
+                                                * (-0.8 * cos + 0.5)), (int) (b.y + b.height
+                                                * (-0.8 * sin + 0.5)), gradientColor);
                                 g.setPaint(gp);
                         }

trunk/src/org/expeditee/items/Justification.java

@@ -16 +16 @@
                 assert (justCode != null);
                 justCode = justCode.trim().toLowerCase();
-                
+
                 // if it is a single char just match the first character
                 if (justCode.length() == 1) {
-                        char code =justCode.charAt(0);
+                        char code = justCode.charAt(0);
                         Justification[] values = values();
-                        for(int i = 1; i < values.length; i++) {
+                        for (int i = 0; i < values.length; i++) {
                                 Justification j = values[i];
-                                if(Character.toLowerCase(j.name().charAt(0)) == code)
+                                if (Character.toLowerCase(j.name().charAt(0)) == code)
                                         return j;
                         }
                         // Otherwise match the whole string
-                }else{
-                        try{
-                        return valueOf(justCode);
-                        }catch (Exception e) {
+                } else {
+                        try {
+                                return valueOf(justCode);
+                        } catch (Exception e) {
                         }
                 }

trunk/src/org/expeditee/items/Text.java

@@ -378 +378 @@
          */
         public Point2D.Float insertChar(char ch, float mouseX, float mouseY) {
-                if (ch != '\t')
+                if (ch != '\t') /* && ch != '\n'*/
                         return insertText("" + ch, mouseX, mouseY);
 
@@ -951 +951 @@
         private static final int NEARBY_GRAVITY = 2;
 
-        private static final int MINIMUM_FONT_SIZE = 6;
+        public static final int MINIMUM_FONT_SIZE = 6;
 
         public void toggleFontFamily() {
@@ -1041 +1041 @@
                         return null;
 
-                if (_text.indexOf("\n") < 0)
-                        return _text.toString();
-
-                return _text.substring(0, _text.indexOf("\n"));
+                // start at the first non-newLine char
+                int index = 0;
+                while (_text.charAt(index) == '\n') {
+                        index++;
+                }
+
+                int nextNewLine = _text.indexOf("\n", index);
+
+                /* If there are no more newLines return the remaining text */
+                if (nextNewLine < 0)
+                        return _text.substring(index);
+
+                return _text.substring(index, nextNewLine);
         }
 
@@ -1150 +1159 @@
                         // check if the cursor is within the top, bottom and within the
                         // gravity of right
+                        int justOffset = getJustOffset(text);
+
                         if (mouseY - textY > textOutline.getY()
                                         && mouseY - textY < textOutline.getY()
                                                         + textOutline.getHeight()
-                                        && mouseX - textX < textOutline.getWidth() + gravity
-                                                        + Item.MARGIN_RIGHT)
+                                        && mouseX - textX - justOffset < textOutline.getWidth()
+                                                        + gravity + Item.MARGIN_RIGHT
+                        /* &&(justOffset == 0 || mouseX > textX + justOffset - gravity ) */)
                                 return true;
                         textY += getLineDrop(text);
@@ -1202 +1214 @@
                 minX -= getLeftMargin();
                 maxX += Item.MARGIN_RIGHT;
+
+                // If its justification right or center then DONT limit the width
+                if (getJustification() != null) {
+                        maxX = Item.MARGIN_RIGHT + getWidth();
+                }
 
                 _poly.addPoint(minX - getGravity(), minY - getGravity());
@@ -1551 +1568 @@
                 copy.setText(_text.toString());
                 copy.setHidden(!isVisible());
-                copy.setWidth(getWidth());
+                // copy.setWidth(getWidth());
                 return copy;
         }
@@ -1580 +1597 @@
                         size = MINIMUM_FONT_SIZE;
                 setFont(getPaintFont().deriveFont(size));
+                rebuild(true);
                 invalidateAll();
         }

trunk/src/org/expeditee/simple/Context.java

@@ -1 +1 @@
 package org.expeditee.simple;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 import org.expeditee.actions.Simple;
@@ -132 +137 @@
                 // Get the values to be set
                 File filePath = new File(primitives_.getStringValue(fileNameVar));
+                
+//               Open an Output Stream Writer to set encoding
+                OutputStream fout = new FileOutputStream(filePath);
+                Writer out = new OutputStreamWriter(fout, "UTF-8");
                 BufferedWriter currentFile = new BufferedWriter(
-                                new FileWriter(filePath));
+                                out);
 
                 pointers_.setObject(fileVar, currentFile);

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

@@ -1 +1 @@
 package org.expeditee.stats;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 import org.expeditee.io.Logger;
@@ -51 +56 @@
                         BufferedWriter writer = new BufferedWriter(new FileWriter(
                                         org.expeditee.gui.FrameIO.STATISTICS_DIR + _filename, true));
+                        
                         writer.write(SessionStats.getCurrentStats());
                         writer.newLine();