Rename AppPreferences and AppMessages Classes back to it's original name

Author: AhmedMagedC

app/src/processing/app/Base.java

@@ -123,7 +123,7 @@ static public void startup() {
 
   static public void cleanTempFiles() {
     final File consoleDir = Base.getSettingsFile("console");
-    final int days = AppPreferences.getInteger("console.temp.days");
+    final int days = Preferences.getInteger("console.temp.days");
 
     if (days > 0) {
       final long now = new Date().getTime();

app/src/processing/app/Console.java

@@ -126,7 +126,7 @@ static private String[] listSupported() {
         throw new IOException("Could not read list of files inside " + baseFolder);
       }
     } catch (IOException e) {
-      AppMessages.showError("Translation Trouble",
+      Messages.showError("Translation Trouble",
         "There was a problem reading the language translations folder.\n" +
         "You may need to reinstall, or report if the problem persists.", e);
     }
@@ -295,7 +295,7 @@ static public void addModeStrings(Mode mode) {
   }
 
 
-//  /** Set new language (called by AppPreferences) */
+//  /** Set new language (called by Preferences) */
 //  static public void setLanguage(String language) {
 //    this.language = language;
 //
@@ -353,7 +353,7 @@ static class LanguageBundle {
       table = new HashMap<>();
 
       // Disabling load from sketchbook in 4.2.1, because the path
-      // is not yet loaded from AppPreferences when languages are loaded.
+      // is not yet loaded from Preferences when languages are loaded.
       // Fixing that (i.e. reloading languages) makes the code a lot
       // more complicated for dubious benefit over simply editing the
       // language files in the download (i.e. still would not help

app/src/processing/app/Language.java

@@ -198,7 +198,7 @@ private void handleExports() {
         if (oldName != null) {
           variantFolder = new File(libraryFolder, variant);
           if (variantFolder.exists()) {
-            AppMessages.log("Please update " + getName() + " for Processing 4. " +
+            Messages.log("Please update " + getName() + " for Processing 4. " +
               variantFolder + " is the older naming scheme.");
           }
         }
@@ -345,18 +345,18 @@ public void addPackageList(Map<String, List<Library>> importToLibraryTable) {
       } else {
         if(!instructed) {
           instructed = true;
-          AppMessages.err("The library found in");
-          AppMessages.err(getPath());
-          AppMessages.err("conflicts with");
+          Messages.err("The library found in");
+          Messages.err(getPath());
+          Messages.err("conflicts with");
           for (Library library : libraries) {
-            AppMessages.err(library.getPath());
+            Messages.err(library.getPath());
           }
-          AppMessages.err("which already define(s) the package " + pkg);
-          AppMessages.err("If you have a line in your sketch that reads");
-          AppMessages.err("import " + pkg + ".*;");
-          AppMessages.err("Then you'll need to first remove one of those libraries.");
+          Messages.err("which already define(s) the package " + pkg);
+          Messages.err("If you have a line in your sketch that reads");
+          Messages.err("import " + pkg + ".*;");
+          Messages.err("Then you'll need to first remove one of those libraries.");
         }else{
-          AppMessages.err("\tPackage ("+pkg+")\t conflict found in [" + name + "] with libraries: " + libraries.stream().map(Library::getName).reduce((a, b) -> a + ", " + b).orElse(""));
+          Messages.err("\tPackage ("+pkg+")\t conflict found in [" + name + "] with libraries: " + libraries.stream().map(Library::getName).reduce((a, b) -> a + ", " + b).orElse(""));
         }
       }
       libraries.add(this);
@@ -585,7 +585,7 @@ static public List<File> discover(File folder) {
               "The library \"" + potentialName + "\" cannot be used.\n" +
               "Library names must contain only basic letters and numbers.\n" +
               "(ASCII only and no spaces, and it cannot start with a number)";
-            AppMessages.showMessage("Ignoring bad library name", mess);
+            Messages.showMessage("Ignoring bad library name", mess);
 
           } else {
             String pkg = findCollision(libraryFolder);
@@ -594,7 +594,7 @@ static public List<File> discover(File folder) {
                 "The library \"" + potentialName + "\" cannot be used\n" +
                 "because it contains the " + pkg + " libraries.\n" +
                 "Please contact the library author for an update.";
-              AppMessages.showMessage("Ignoring bad library", mess);
+              Messages.showMessage("Ignoring bad library", mess);
 
               // Move the folder out of the way
               File badFolder = new File(baseFolder.getParentFile(), "disabled");
@@ -637,7 +637,7 @@ static public List<Library> list(File folder) {
       if (foundEarlier != null) {
         // Warn the user about this duplication (later, on the EDT)
         if (!duplicateLibraries.contains(name)) {
-          AppMessages.showWarningTiered("Duplicate Library Found",
+          Messages.showWarningTiered("Duplicate Library Found",
             "There are multiple libraries named “" + name + "”",
             "Please remove either “" + foundEarlier.getName() +
               " or “" + lib.getName() + "”\n" +

app/src/processing/app/Library.java

@@ -19,16 +19,14 @@
 package processing.app
 
 import processing.app.ui.Toolkit
-import processing.utils.Messages
-
 import java.awt.EventQueue
 import java.awt.Frame
 import java.io.PrintWriter
 import java.io.StringWriter
 import javax.swing.JFrame
 import javax.swing.JOptionPane
 
-class AppMessages : Messages() {
+class Messages : processing.utils.Messages() {
     companion object {
         /**
          * Non-fatal error message with two levels of formatting.

app/src/processing/app/AppMessages.kt renamed to app/src/processing/app/Messages.kt

@@ -107,7 +107,7 @@ public Mode(Base base, File folder) {
         loadKeywords(file);
       }
     } catch (IOException e) {
-      AppMessages.showWarning("Problem loading keywords",
+      Messages.showWarning("Problem loading keywords",
                            "Could not load keywords file for " + getTitle() + " mode.", e);
     }
   }
@@ -371,7 +371,7 @@ public Library getLibrary(String pkgName) throws SketchException {
         secondary += "<b>" + library.getName() + "</b> (" + location + ")<br>";
       }
       secondary += "Extra libraries need to be removed before this sketch can be used.";
-      AppMessages.showWarningTiered("Duplicate Library Problem", primary, secondary, null);
+      Messages.showWarningTiered("Duplicate Library Problem", primary, secondary, null);
       throw new SketchException("Duplicate libraries found for " + pkgName + ".");
 
     } else {
@@ -820,7 +820,7 @@ public Library findLibraryByName(String libName) {
   public void prepareExportFolder(File targetFolder) {
     if (targetFolder != null) {
       // Nuke the old application folder because it can cause trouble
-      if (AppPreferences.getBoolean("export.delete_target_folder")) {
+      if (Preferences.getBoolean("export.delete_target_folder")) {
         if (targetFolder.exists()) {
           try {
             Platform.deleteFile(targetFolder);
@@ -833,7 +833,7 @@ public void prepareExportFolder(File targetFolder) {
       // Create a fresh output folder (needed before preproc is run next)
       if (!targetFolder.exists()) {
         if (!targetFolder.mkdirs()) {
-          AppMessages.err("Could not create " + targetFolder);
+          Messages.err("Could not create " + targetFolder);
         }
       }
     }

app/src/processing/app/Mode.java

@@ -103,7 +103,7 @@ static public void init() {
       inst = (DefaultPlatform) platformClass.getDeclaredConstructor().newInstance();
 
     } catch (Exception e) {
-      AppMessages.showError("Problem Setting the Platform",
+      Messages.showError("Problem Setting the Platform",
                          "An unknown error occurred while trying to load\n" +
                          "platform-specific code for your machine.", e);
     }
@@ -163,7 +163,7 @@ static public void openURL(String url) {
       inst.openURL(url);
 
     } catch (Exception e) {
-      AppMessages.showWarning("Problem Opening URL",
+      Messages.showWarning("Problem Opening URL",
                            "Could not open the URL\n" + url, e);
     }
   }
@@ -187,7 +187,7 @@ static public void openFolder(File file) {
       inst.openFolder(file);
 
     } catch (Exception e) {
-      AppMessages.showWarning("Problem Opening Folder",
+      Messages.showWarning("Problem Opening Folder",
                            "Could not open the folder\n" + file.getAbsolutePath(), e);
     }
   }
@@ -355,7 +355,7 @@ static public File getContentFile(String name) {
       try {
         decodedPath = pathURL.toURI().getSchemeSpecificPart();
       } catch (URISyntaxException e) {
-        AppMessages.showError("Missing File",
+        Messages.showError("Missing File",
           "Could not access a required file:\n" +
             "<b>" + name + "</b>\n" +
             "You may need to reinstall Processing.", e);
@@ -582,7 +582,7 @@ static public boolean deleteFile(File file) throws IOException {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
   /**
-   * These methods were refactored to use the AppPreferences system instead of
+   * These methods were refactored to use the Preferences system instead of
    * actual environment variables, since modifying environment variables at runtime
    * proved problematic. This approach provides similar functionality
    * while being compatible with various platforms and execution environments.
@@ -592,11 +592,11 @@ static public boolean deleteFile(File file) throws IOException {
    */
 
   static public void setenv(String variable, String value) {
-    AppPreferences.set(variable, value);
+    Preferences.set(variable, value);
   }
 
   static public String getenv(String variable) {
-    return AppPreferences.get(variable);
+    return Preferences.get(variable);
   }
 
   static public int unsetenv(String variable) {

app/src/processing/app/Platform.java

@@ -1,14 +1,13 @@
 package processing.app;
 
-import processing.utils.Preferences;
 import processing.app.ui.Toolkit;
 
 import java.awt.*;
 
-public class AppPreferences extends Preferences {
+public class Preferences extends processing.utils.Preferences {
 
     static public void init() {
-        Preferences.init();
+        processing.utils.Preferences.init();
 
         // For CJK users, enable IM support by default
         if (Language.useInputMethod() && !getBoolean("editor.input_method_support")) {

app/src/processing/app/AppPreferences.java renamed to app/src/processing/app/Preferences.java

@@ -162,9 +162,9 @@ class Schema {
                 }
                 ?: emptyMap()
             for ((key, value) in options){
-                AppPreferences.set(key, value)
+                Preferences.set(key, value)
             }
-            AppPreferences.save()
+            Preferences.save()
 
             return null
         }

app/src/processing/app/Schema.kt

@@ -32,7 +32,7 @@
 
 
 /**
- * Storage class for theme settings. This was separated from the AppPreferences
+ * Storage class for theme settings. This was separated from the Preferences
  * class for 1.0 so that the coloring wouldn't conflict with previous releases
  * and to make way for future ability to customize.
  */
@@ -88,7 +88,7 @@ public void load(File additions) {
         }
       }
     } else {
-      AppMessages.err(additions + " could not be read");
+      Messages.err(additions + " could not be read");
     }
 
     // check for platform-specific properties in the defaults
@@ -201,7 +201,7 @@ public void setColor(String attr, Color what) {
   }
 
 
-  // identical version found in AppPreferences.java
+  // identical version found in Preferences.java
   public Font getFont(String attr) {
     try {
       boolean replace = false;
@@ -250,7 +250,7 @@ public Font getFont(String attr) {
     } catch (Exception e) {
       // Adding try/catch block because this may be where
       // a lot of startup crashes are happening.
-      AppMessages.log("Error with font " + get(attr) + " for attribute " + attr);
+      Messages.log("Error with font " + get(attr) + " for attribute " + attr);
     }
     return new Font("Dialog", Font.PLAIN, 12);
   }