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

Timestamp:

05/30/08 10:14:43 (16 years ago)

Author:

ra33

Message:

Added some more unit tests
Did a bunch of refactoring
AND added a few new features... @b @v were the most significant

File:

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

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

@@ -98 +98 @@
         public static void RunCurrentItem(Item current) {
                 if (current instanceof Text) {
-                        List<String> actions = ((Text) current).getText();
+                        List<String> actions = ((Text) current).getTextList();
 
                         for (String action : actions) {
@@ -117 +117 @@
                 Frame toDelete = DisplayIO.getCurrentFrame();
                 DisplayIO.Back();
-                String deletedFrame = toDelete.getFrameName();
+                String deletedFrame = toDelete.getName();
                 String deletedFrameNameLowercase = deletedFrame.toLowerCase();
                 try {
@@ -123 +123 @@
                         if (!del) {
                                 FrameGraphics.ErrorMessage("Error trying to delete "
-                                                + toDelete.getFrameName());
+                                                + toDelete.getName());
                         } else {
                                 Frame current = DisplayIO.getCurrentFrame();
@@ -316 +316 @@
          */
         public static void JpegFrame(String framename) {
-                ImageFrame(framename, "JPG");
+                ImageFrame(framename, "JPEG");
         }
 
         /**
          * Saves the current frame as a JPEG image. This is the same as calling
-         * JpegFrame(currentFrame.getFrameName())
+         * JpegFrame(currentFrame.getName())
          */
         public static void JpegFrame() {
-                ImageFrame(DisplayIO.getCurrentFrame().getFrameName(), "JPG");
+                ImageFrame(DisplayIO.getCurrentFrame().getName(), "JPEG");
+        }
+
+        public static void JPGFrame() {
+                JpegFrame();
         }
 
@@ -339 +343 @@
         /**
          * Saves the current frame as a PNG image. This is the same as calling
-         * PNGFrame(currentFrame.getFrameName())
+         * PNGFrame(currentFrame.getName())
          */
         public static void PNGFrame() {
-                ImageFrame(DisplayIO.getCurrentFrame().getFrameName(), "PNG");
+                ImageFrame(DisplayIO.getCurrentFrame().getName(), "PNG");
+        }
+
+        public static String SaveImage(BufferedImage screen, String format, String directory, String fileName){
+                // Check if we need to append the suffix
+                if (fileName.indexOf('.') < 0)
+                        fileName += "." + format.toLowerCase();         
+
+                try {
+                        // set up the file for output
+                        String fullFileName = directory + fileName;
+                        File out = new File(fullFileName);
+                        if (!out.getParentFile().exists())
+                                out.mkdirs();
+
+                        // If the image is successfully written out return the fileName
+                        if (ImageIO.write(screen, format, out))
+                                return fileName;
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+        
+        public static String ImageFrame(Frame frame, String format, String directory) {
+                assert (frame != null);
+                
+                FrameGraphics.UpdateBuffer(frame, false);
+
+                BufferedImage screen = null;
+                Image frameBuffer = frame.getBuffer();
+                if (frame.getBuffer() instanceof BufferedImage) {
+                        screen = (BufferedImage) frameBuffer;
+                } else if (frameBuffer instanceof VolatileImage) {
+                        screen = ((VolatileImage) frameBuffer).getSnapshot();
+                } else {
+                        assert (false);
+                }
+                return SaveImage(screen, format, directory, frame.getExportFileName());
         }
 
@@ -355 +398 @@
         public static void ImageFrame(String framename, String format) {
                 Frame loaded = FrameIO.LoadFrame(framename);
-                String fileName = loaded.getExportFileName();
 
                 // if the frame was loaded successfully
                 if (loaded != null) {
-                        // check if the buffer needs to be redrawn
-                        // if (loaded.getBuffer() == null)
-                        FrameGraphics.UpdateBuffer(loaded, false);
-                        
-                        BufferedImage screen = null;
-                        Image frameBuffer = loaded.getBuffer();
-                        if (loaded.getBuffer() instanceof BufferedImage){
-                                screen = (BufferedImage)frameBuffer;
-                        }else if (frameBuffer instanceof VolatileImage){
-                                screen = ((VolatileImage)frameBuffer).getSnapshot();
-                        }else{
-                                assert(false);
-                        }
-
-                        try {
-                                // set up the file for output
-                                File out = new File(FrameIO.EXPORTS_DIR + fileName + "."
-                                                + format.toLowerCase());
-                                if (!out.getParentFile().exists())
-                                        out.mkdirs();
-
-                                ImageIO.write(screen, format, out);
+                        String path = FrameIO.IMAGES_PATH;
+                        String frameName = ImageFrame(loaded, format, path);
+                        if (frameName != null)
                                 FrameGraphics.DisplayMessage("Frame successfully saved to "
-                                                + FrameIO.EXPORTS_DIR + out.getName());
-                        } catch (IOException e) {
-                                FrameGraphics.ErrorMessage(e.getMessage());
-                        }
+                                                + path + frameName);
+                        else
+                                FrameGraphics.ErrorMessage("Could not find image writer for "
+                                                + format + " format");
                         // if the frame was not loaded successfully, alert the user
                 } else
@@ -455 +478 @@
                                 timeKeeper.restart();
                                 for (int j = 0; j < repsPerTest; j++) {
-                                        methodA.invoke((Object) null, new Object[]{});
+                                        methodA.invoke((Object) null, new Object[] {});
                                 }
                                 timeA += timeKeeper.getElapsedMillis();
@@ -461 +484 @@
                                 // Test methodB
                                 for (int j = 0; j < repsPerTest; j++) {
-                                        methodB.invoke((Object) null, new Object[]{});
+                                        methodB.invoke((Object) null, new Object[] {});
                                 }
                                 timeB += timeKeeper.getElapsedMillis();
@@ -530 +553 @@
                 // swap the items links
                 item.setActions(current.getAction());
-                item.setLink(childFrame.getFrameName());
-                current.setLink(parentFrame.getFrameName());
+                item.setLink(childFrame.getName());
+                current.setLink(parentFrame.getName());
                 // current.setLink(null);
                 current.setActions(null);
@@ -564 +587 @@
 
                 for (Item i : body)
-                        if (i != child.getTitle() && !i.isAnnotation()) {
+                        if (i != child.getTitleItem() && !i.isAnnotation()) {
                                 item = i;
                                 break;