Changeset 154 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

07/22/08 10:05:32 (16 years ago)

Author:

ra33

Message:

Fixing bugs for Rob

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (6 diffs)

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

@@ -103 +103 @@
                 String errorMessage = "Error deleting " + deletedFrame;
                 try {
-                        if (FrameIO.DeleteFrame(toDelete)) {
+                        String deletedFrameName = FrameIO.DeleteFrame(toDelete);
+                        if (deletedFrameName != null) {
+                                DisplayIO.Back();
+                                //Remove any links on the previous frame to the one being deleted
                                 Frame current = DisplayIO.getCurrentFrame();
                                 for (Item i : current.getItems())
@@ -111 +114 @@
                                                 i.setLink(null);
                                         }
-                                DisplayIO.Back();
-                                FrameGraphics.Repaint();
-                                MessageBay.displayMessage(deletedFrame + " deleted");
+                                MessageBay.displayMessage(deletedFrame + " renamed "
+                                                + deletedFrameName);
+                                //FrameGraphics.Repaint();
                                 return;
                         }
@@ -302 +305 @@
 
         public static void getUnicodeCharacters(int start, int finish) {
-                if(start < 0 && finish < 0){
+                if (start < 0 && finish < 0) {
                         throw new RuntimeException("Parameters must be non negative");
                 }
-                //Swap the start and finish if they are inthe wrong order
-                if(start > finish){
+                // Swap the start and finish if they are inthe wrong order
+                if (start > finish) {
                         start += finish;
-                        finish = start-finish;
+                        finish = start - finish;
                         start = start - finish;
                 }
                 StringBuilder charList = new StringBuilder();
                 int count = 0;
-                charList.append(String.format("Unicode block 0x%x - 0x%x", start, finish));
+                charList.append(String.format("Unicode block 0x%x - 0x%x", start,
+                                finish));
                 System.out.println();
-                //charList.append("Unicode block: ").append(String.format(format, args))
-                for (char i = (char)start; i < (char)finish; i++) {
+                // charList.append("Unicode block: ").append(String.format(format,
+                // args))
+                for (char i = (char) start; i < (char) finish; i++) {
                         if (Character.isDefined(i)) {
-                                if(count++ % 64 == 0)
+                                if (count++ % 64 == 0)
                                         charList.append(Text.LINE_SEPARATOR);
                                 charList.append(Character.valueOf(i));
@@ -325 +330 @@
                 attachTextToCursor(charList.toString());
         }
-        
+
         /**
          * Gets a single block of Unicode characters.
-         * @param start the start of the block
+         * 
+         * @param start
+         *            the start of the block
          */
         public static void getUnicodeCharacters(int start) {
-                getUnicodeCharacters(start,start + 256);
-        }
-        
+                getUnicodeCharacters(start, start + 256);
+        }
+
         public static void getMathSymbols() {
-                getUnicodeCharacters('\u2200','\u2300');
+                getUnicodeCharacters('\u2200', '\u2300');
         }
 
@@ -442 +449 @@
                         String frameName = ImageFrame(loaded, format, path);
                         if (frameName != null)
-                                MessageBay.displayMessage("Frame successfully saved to "
-                                                + path + frameName);
+                                MessageBay.displayMessage("Frame successfully saved to " + path
+                                                + frameName);
                         else
                                 MessageBay.errorMessage("Could not find image writer for "
@@ -471 +478 @@
                         // TODO is there a built in method which will do this faster?
 
-                        MessageBay.displayMessage("Copying file " + existingFile
-                                        + " to " + newFileName + "...");
+                        MessageBay.displayMessage("Copying file " + existingFile + " to "
+                                        + newFileName + "...");
                         FrameIO.copyFile(existingFile, newFileName);
                         MessageBay.displayMessage("File copied successfully");