clean up MovieMaker a little

benfry · benfry · commit 848e1f3e43f2 · 2015-08-16T12:07:12.000-04:00
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -408,17 +408,17 @@ delete.messages.is_read_only.description = Some files are marked "read-only", so
 
 # Save handler
 save_file.messages.is_read_only = Sketch is read-only
-save_file.messages.is_read_only.description = Some files are marked "read-only", so you'll\nneed to re-save this sketch to another location.
+save_file.messages.is_read_only.description = Some files are marked "read-only", so you will\nneed to re-save this sketch to another location.
 save_file.messages.sketch_exists = Cannot Save
 save_file.messages.sketch_exists.description = A sketch with the cleaned name\n&ldquo;%s&rdquo; already exists.
 save_file.messages.tab_exists = Nope
-save_file.messages.tab_exists.description = You can't save the sketch as "%s"\nbecause the sketch already has a tab with that name.
+save_file.messages.tab_exists.description = You cannot save the sketch as "%s"\nbecause the sketch already has a tab with that name.
 save_file.messages.recursive_save = How very Borges of you
 save_file.messages.recursive_save.description = You cannot save the sketch into a folder\ninside itself. This would go on forever.
 
 # Add handler
 add_file.messages.is_read_only = Sketch is Read-Only
-add_file.messages.is_read_only.description = Some files are marked "read-only", so you'll\nneed to re-save the sketch in another location,\nand try again.
+add_file.messages.is_read_only.description = Some files are marked "read-only", so you will\nneed to re-save the sketch in another location,\nand try again.
 add_file.messages.confirm_replace = Replace the existing version of %s?
 add_file.messages.error_adding = Error adding file
 add_file.messages.cannot_delete.description = Could not delete the existing '%s' file.
@@ -565,8 +565,8 @@ movie_maker.orig_size_tooltip = Check this box if the folder contains already en
 
 movie_maker.error.avoid_tiff = Try TGA or PNG images instead of TIFF.
 movie_maker.error.badnumbers = Width and height must be whole numbers greater than zero; framerate must be a number greater than zero.
-movie_maker.error.cant_read = Could not read %s.
-movie_maker.error.cant_read_maybe_bad = Could not read %s; it may be bad.
+movie_maker.error.cannot_read = Could not read %s.
+movie_maker.error.cannot_read_maybe_bad = Could not read %s; it may be bad.
 movie_maker.error.movie_failed = Creating the QuickTime movie failed.
 movie_maker.error.need_input = You need to specify the folder with image files, the sound file, or both.
 movie_maker.error.no_images_found = No image files found.
diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
@@ -61,53 +61,22 @@
  * Ben Fry 2011-09-06, updated 2013-10-09
  */
 public class MovieMaker extends JFrame implements Tool {
-//  private JFileChooser imageFolderChooser;
-//  private JFileChooser soundFileChooser;
-//  private JFileChooser movieFileChooser;
   private Preferences prefs;
 
-//  private Editor editor;
-
-//MovieMaker m = new MovieMaker();
-//m.setVisible(true);
-//m.pack();
 
   public String getMenuTitle() {
     return Language.text("movie_maker");
   }
 
 
   public void run() {
-//    System.out.println("calling run() for MovieMaker " + EventQueue.isDispatchThread());
     setVisible(true);
   }
 
 
-//  public void run() {
-//    String classPath =
-//      getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
-//    System.out.println("cp is " + classPath);
-//    try {
-//      String[] cmd = new String[] {
-//        "java", "-cp", classPath, "processing.app.tools.MovieMaker"
-//      };
-//      Runtime.getRuntime().exec(cmd);
-//    } catch (IOException e) {
-//      e.printStackTrace();
-//    }
-//  }
-
-
   public void init(Editor editor) {
-//    System.out.println("calling init for MovieMaker " + EventQueue.isDispatchThread());
-//    this.editor = editor;
     initComponents(editor == null);
 
-//    String version = getClass().getPackage().getImplementationVersion();
-//    if (version != null) {
-//      setTitle(getTitle() + " " + version);
-//    }
-
     ((JComponent) getContentPane()).setBorder(new EmptyBorder(12, 18, 18, 18));
     imageFolderField.setTransferHandler(new FileTextFieldTransferHandler(JFileChooser.DIRECTORIES_ONLY));
     soundFileField.setTransferHandler(new FileTextFieldTransferHandler());
@@ -122,9 +91,6 @@ public void init(Editor editor) {
       heightField,
       heightLabel,
       originalSizeCheckBox,
-//      noPreparationRadio,
-//      fastStartCompressedRadio,
-//      fastStartRadio
     };
     for (JComponent c : smallComponents) {
       c.putClientProperty("JComponent.sizeVariant", "small");
@@ -561,34 +527,6 @@ private void createMovie(final File movieFile) {
     prefs.putInt("movie.compression", compressionBox.getSelectedIndex());
     prefs.putBoolean("movie.originalSize", originalSizeCheckBox.isSelected());
 
-
-    // ---------------------------------
-    // Choose an output file
-    // ---------------------------------
-    /*
-    if (movieFileChooser == null) {
-      movieFileChooser = new JFileChooser();
-      if (prefs.get("movie.outputFile", null) != null) {
-        movieFileChooser.setSelectedFile(new File(prefs.get("movie.outputFile", null)));
-      } else {
-        if (imageFolderField.getText().length() > 0) {
-          movieFileChooser.setCurrentDirectory(new File(imageFolderField.getText()).getParentFile());
-        } else if (soundFileField.getText().length() > 0) {
-          movieFileChooser.setCurrentDirectory(new File(soundFileField.getText()).getParentFile());
-        }
-      }
-    }
-    if (JFileChooser.APPROVE_OPTION != movieFileChooser.showSaveDialog(this)) {
-      return;
-    }
-
-    final File movieFile = movieFileChooser.getSelectedFile().getPath().toLowerCase().endsWith(".mov")//
-    ? movieFileChooser.getSelectedFile()
-        : new File(movieFileChooser.getSelectedFile().getPath() + ".mov");
-    prefs.put("movie.outputFile", movieFile.getPath());
-    createMovieButton.setEnabled(false);
-    */
-
     final boolean originalSize = originalSizeCheckBox.isSelected();
 
     // ---------------------------------
@@ -599,15 +537,15 @@ private void createMovie(final File movieFile) {
       @Override
       protected Object doInBackground() {
         try {
-
           // Read image files
           File[] imgFiles = null;
           if (imageFolder != null) {
             imgFiles = imageFolder.listFiles(new FileFilter() {
               FileSystemView fsv = FileSystemView.getFileSystemView();
 
               public boolean accept(File f) {
-                return f.isFile() && !fsv.isHiddenFile(f) && !f.getName().equals("Thumbs.db");
+                return f.isFile() && !fsv.isHiddenFile(f) &&
+                  !f.getName().equals("Thumbs.db");
               }
             });
             if (imgFiles == null || imgFiles.length == 0) {
@@ -617,23 +555,14 @@ public boolean accept(File f) {
           }
 
           // Get the width and height if we're preserving size.
-          // Nullify bad Files so we don't get errors twice.
           if (originalSize) {
-            for (int i = 0; true; ++i) {
+            Dimension d = findSize(imgFiles);
+            if (d == null) {
               // No images at all? No video then.
-              if (i >= imgFiles.length) {
-                throw new RuntimeException(Language.text("movie_maker.error.no_images_found"));
-              }
-
-              BufferedImage temp = readImage(imgFiles[i]);
-              if (temp == null) {
-                imgFiles[i] = null;
-              } else {
-                width = temp.getWidth();
-                height = temp.getHeight();
-                break;
-              }
+              throw new RuntimeException(Language.text("movie_maker.error.no_images_found"));
             }
+            width = d.width;
+            height = d.height;
           }
 
           // Delete movie file if it already exists.
@@ -655,6 +584,19 @@ public boolean accept(File f) {
         }
       }
 
+      Dimension findSize(File[] imgFiles) {
+        for (int i = 0; i < imgFiles.length; i++) {
+          BufferedImage temp = readImage(imgFiles[i]);
+          if (temp != null) {
+            return new Dimension(temp.getWidth(), temp.getHeight());
+          } else {
+            // Nullify bad Files so we don't get errors twice.
+            imgFiles[i] = null;
+          }
+        }
+        return null;
+      }
+
       @Override
       protected void done() {
         Object o;
@@ -681,18 +623,14 @@ protected void done() {
 
 
   /**
-   * Read an image from a file. ImageIcon doesn't don't do well with some file
-   * types, so we use ImageIO. ImageIO doesn't handle TGA files created by
-   * Processing, so this calls our own loadImageTGA().
+   * Read an image from a file. ImageIcon doesn't don't do well with some
+   * file types, so we use ImageIO. ImageIO doesn't handle TGA files
+   * created by Processing, so this calls our own loadImageTGA().
    * <br> Prints errors itself.
    * @return null on error; image only if okay.
    */
   private BufferedImage readImage(File file) {
     try {
-      // Make sure that we're using a ClassLoader that's aware of the ImageIO jar
-      //Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-      //BufferedImage image = ImageIO.read(file);
-      // rewritten to switch back to the default loader
       Thread current = Thread.currentThread();
       ClassLoader origLoader = Thread.currentThread().getContextClassLoader();
       current.setContextClassLoader(getClass().getClassLoader());
@@ -701,7 +639,7 @@ private BufferedImage readImage(File file) {
       try {
         image = ImageIO.read(file);
       } catch (IOException e) {
-        System.err.println(Language.interpolate("movie_maker.error.cant_read",
+        System.err.println(Language.interpolate("movie_maker.error.cannot_read",
               file.getAbsolutePath()));
         return null;
       }
@@ -725,40 +663,43 @@ private BufferedImage readImage(File file) {
           try {
             return loadImageTGA(file);
           } catch (IOException e) {
-            System.err.println(Language.interpolate("movie_maker.error.cant_read",
-                  file.getAbsolutePath()));
+            cannotRead(file);
             return null;
           }
 
         } else if (pathLower.endsWith(".tif") || pathLower.endsWith(".tiff")) {
-          System.err.println(Language.interpolate("movie_maker.error.cant_read",
-                file.getAbsolutePath()) + " " +
-                Language.text("movie_maker.error.avoid_tiff"));
+          cannotRead(file);
+          System.err.println(Language.text("movie_maker.error.avoid_tiff"));
           return null;
 
         } else {
-          System.err.println(Language.interpolate("movie_maker.error.cant_read",
-                file.getAbsolutePath()));
+          cannotRead(file);
           return null;
         }
 
       } else {
         if (image.getWidth() <= 0 || image.getHeight() <= 0) {
-          System.err.println(Language.interpolate("movie_maker.error.cant_read_maybe_bad",
-                file.getAbsolutePath()));
+          System.err.println(Language.interpolate("movie_maker.error.cannot_read_maybe_bad", file.getAbsolutePath()));
           return null;
         }
       }
       return image;
 
     // Catch-all is sometimes needed.
     } catch (RuntimeException e) {
-      System.err.println(Language.interpolate("movie_maker.error.cant_read", file.getAbsolutePath()));
+      cannotRead(file);
       return null;
     }
   }
 
 
+  private void cannotRead(File file) {
+    String path = file.getAbsolutePath();
+    String msg = Language.interpolate("movie_maker.error.cannot_read", path);
+    System.err.println(msg);
+  }
+
+
   /** variable frame rate. */
   private void writeVideoOnlyVFR(File movieFile, File[] imgFiles, int width, int height, double fps, QuickTimeWriter.VideoFormat videoFormat, /*boolean passThrough,*/ String streaming) throws IOException {
     File tmpFile = streaming.equals("none") ? movieFile : new File(movieFile.getPath() + ".tmp");
