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

Timestamp:

05/01/08 12:26:53 (16 years ago)

Author:

ra33

Message:

New expeditee version

File:

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

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

@@ -6 +6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
@@ -113 +111 @@
                 Frame toDelete = DisplayIO.getCurrentFrame();
                 DisplayIO.Back();
+                String deletedFrame = toDelete.getFrameName();
+                String deletedFrameNameLowercase = deletedFrame.toLowerCase();
                 try {
-                        String deletedFrame = toDelete.getFrameName();
                         boolean del = FrameIO.DeleteFrame(toDelete);
                         if (!del) {
@@ -123 +122 @@
                                 for (Item i : current.getItems())
                                         if (i.getLink() != null
-                                                        && i.getLink().toLowerCase().equals(
-                                                                        toDelete.getFrameName().toLowerCase())) {
+                                                        && i.getAbsoluteLink().toLowerCase().equals(
+                                                                        deletedFrameNameLowercase)) {
                                                 i.setLink(null);
                                         }
 
                                 FrameGraphics.Repaint();
-                                FrameGraphics.DisplayMessage(deletedFrame
-                                                + " Deleted.");
+                                FrameGraphics.DisplayMessage(deletedFrame + " Deleted.");
                         }
                 } catch (IOException ioe) {
-                        FrameGraphics.ErrorMessage("Error trying to delete "
-                                        + toDelete.getFrameName() + ":\n" + ioe.getMessage());
+                        FrameGraphics.ErrorMessage("Error trying to delete " + deletedFrame
+                                        + ":\n" + ioe.getMessage());
                 }
         }
@@ -240 +238 @@
                 FrameGraphics.Repaint();
         }
-        
+
         /**
          * Creates a new Text Object containing the available fonts.
@@ -246 +244 @@
         public static void GetAvailableFontFamilyNames() {
 
-                String[] availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+                String[] availableFonts = GraphicsEnvironment
+                                .getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
                 StringBuilder fontsList = new StringBuilder();
-                for (String s: availableFonts) {
+                for (String s : availableFonts) {
                         fontsList.append(s).append('\n');
                 }
-                
+
                 Text text = DisplayIO.getCurrentFrame().createNewText();
                 // We dont want the stats to wrap at all
@@ -364 +363 @@
         public static void CopyFile(String existingFile, String newFileName) {
                 try {
-                        //TODO is there a built in method which will do this faster?
-                        
-                        FrameGraphics.DisplayMessage("Copying file " + existingFile + " to " + newFileName + "...");
-                        FileInputStream is = new FileInputStream(existingFile);
-                        FileOutputStream os = new FileOutputStream(
-                                        newFileName, false);
-                        int data;
-                        while ( (data = is.read()) != -1 ) {
-                                os.write(data);
-                        }
-                        os.flush();
-                        os.close();
-                        is.close();
+                        // TODO is there a built in method which will do this faster?
+
+                        FrameGraphics.DisplayMessage("Copying file " + existingFile
+                                        + " to " + newFileName + "...");
+                        FrameIO.copyFile(existingFile, newFileName);
                         FrameGraphics.DisplayMessage("File copied successfully");
                 } catch (FileNotFoundException e) {
                         FrameGraphics.DisplayMessage("Error opening file: " + existingFile);
-                } catch (Exception e){
+                } catch (Exception e) {
                         FrameGraphics.DisplayMessage("File could not be copied");
                 }
@@ -446 +437 @@
 
                 for (Item i : body)
-                        if (i != child.getTitle() && i != child.getName()
+                        if (i != child.getTitle() && i != child.getFrameNameItem()
                                         && !i.isAnnotation()) {
                                 item = i;