sensible renaming

benfry · benfry · commit 862721ecda77 · 2015-08-13T20:01:02.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -871,7 +871,7 @@ protected Editor handleOpen(String path, boolean untitled,
           if (tab.getFile().equals(file)) {
             editor.toFront();
             // move back to the top of the recent list
-            Recent.handle(editor);
+            Recent.append(editor);
             return editor;
           }
         }
@@ -899,7 +899,7 @@ protected Editor handleOpen(String path, boolean untitled,
         // opened successfully, let's go to work
         editor.getSketch().setUntitled(untitled);
         editors.add(editor);
-        Recent.handle(editor);
+        Recent.append(editor);
 
         // now that we're ready, show the window
         // (don't do earlier, cuz we might move it based on a window being closed)
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -966,7 +966,7 @@ public void run() {
     setUntitled(false);
 
     // Add this sketch back using the new name
-    Recent.handle(editor);
+    Recent.append(editor);
 
     // let Editor know that the save was successful
     return true;
@@ -998,7 +998,7 @@ protected void updateInternal(String sketchName, File sketchFolder) {
 //    System.out.println("modified is now " + modified);
     editor.updateTitle();
     editor.getBase().rebuildSketchbookMenus();
-    Recent.handleRename(editor, oldPath);
+    Recent.rename(editor, oldPath);
 //    editor.header.rebuild();
   }
 
diff --git a/app/src/processing/app/ui/Recent.java b/app/src/processing/app/ui/Recent.java
@@ -21,12 +21,17 @@
 
 package processing.app.ui;
 
-import java.awt.event.*;
-import java.io.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 
 import processing.app.Base;
 import processing.app.Language;
@@ -128,7 +133,8 @@ static private void updateMenu(JMenu menu) {
   }
 
 
-  static private void updateMenuRecord(JMenu menu, final Record rec, String sketchbookPath) {
+  static private void updateMenuRecord(JMenu menu, final Record rec,
+                                       String sketchbookPath) {
     try {
       String recPath = new File(rec.getPath()).getParent();
       String purtyPath = null;
@@ -275,7 +281,7 @@ synchronized static public void remove(Editor editor) {
    * entry on the Recent queue. If the sketch is already in the list, it is
    * first removed so it doesn't show up multiple times.
    */
-  synchronized static public void handle(Editor editor) {
+  synchronized static public void append(Editor editor) {
     if (!editor.getSketch().isUntitled()) {
       // If this sketch is already in the menu, remove it
       remove(editor);
@@ -295,18 +301,18 @@ synchronized static public void handle(Editor editor) {
     }
   }
 
-//handles renaming done within  processing
-  synchronized static public void handleRename(Editor editor,String oldPath){
-      if (records.size() == Preferences.getInteger("recent.count")) {
-        records.remove(0);  // remove the first entry
-      }
-      int index = findRecord(oldPath);
-      //check if record exists
-      if (index != -1) {
-        records.remove(index);
-      }
-      records.add(new Record(editor));
-      save();
+
+  synchronized static public void rename(Editor editor, String oldPath) {
+    if (records.size() == Preferences.getInteger("recent.count")) {
+      records.remove(0);  // remove the first entry
+    }
+    int index = findRecord(oldPath);
+    //check if record exists
+    if (index != -1) {
+      records.remove(index);
+    }
+    records.add(new Record(editor));
+    save();
   }
 
 
