remove unused confirmReplace variable from install() functions for contribs

Author: benfry

app/src/processing/app/contrib/AvailableContribution.java

@@ -131,7 +131,7 @@ static private AvailableContribution findContrib(File contribArchive) throws IOE
   static public LocalContribution install(Base base, File contribArchive) throws IOException {
     AvailableContribution ac = findContrib(contribArchive);
     if (ac != null) {
-      return ac.install(base, contribArchive, false, null);
+      return ac.install(base, contribArchive, null);
     }
     return null;
   }
@@ -140,15 +140,12 @@ static public LocalContribution install(Base base, File contribArchive) throws I
   /**
    * @param contribArchive
    *          a zip file containing the library to install
-   * @param confirmReplace
-   *          true to open a dialog asking the user to confirm removing/moving
-   *          the library when a library by the same name already exists
    * @param status
    *          the StatusPanel. Pass null if this function is called for an
    *          install-on-startup
    */
   public LocalContribution install(Base base, File contribArchive,
-                                   boolean confirmReplace, StatusPanel status) {
+                                   StatusPanel status) {
     // Unzip the file into the modes, tools, or libraries folder inside the
     // sketchbook. Unzipping to /tmp is problematic because it may be on
     // another file system, so move/rename operations will break.
@@ -191,8 +188,7 @@ public LocalContribution install(Base base, File contribArchive,
 
           // Check to make sure nothing has the same name already,
           // backup old if needed, then move things into place and reload.
-          installedContrib =
-            newContrib.copyAndLoad(base, confirmReplace, status);
+          installedContrib = newContrib.copyAndLoad(base, status);
 
           // Unlock all the jars if it is a mode or tool
           if (newContrib.getType() == ContributionType.MODE) {

app/src/processing/app/contrib/ContributionManager.java

@@ -157,7 +157,7 @@ static void downloadAndInstall(final Base base,
           if (downloadProgress.notCanceled() && !downloadProgress.isException()) {
             installProgress.startTask(Language.text("contrib.progress.installing"));
             final LocalContribution installed =
-              available.install(base, contribZip, false, status);
+              available.install(base, contribZip, status);
 
             if (installed != null) {
               try {
@@ -241,7 +241,7 @@ static void downloadAndInstallOnStartup(final Base base, final URL url,
         try {
           download(url, null, contribZip, null);
           final LocalContribution installed =
-            available.install(base, contribZip, false, null);
+            available.install(base, contribZip, null);
 
           if (installed != null) {
             try {
@@ -373,7 +373,7 @@ static public void downloadAndInstallOnImport(final Base base,
             String arg = "contrib.import.progress.install";
             editor.statusNotice(Language.interpolate(arg,available.name));
             final LocalContribution installed =
-              available.install(base, contribZip, false, null);
+              available.install(base, contribZip, null);
 
             if (installed != null) {
               try {

app/src/processing/app/contrib/LocalContribution.java

@@ -164,7 +164,6 @@ public String initLoader(String className) throws Exception {
 
 
   LocalContribution copyAndLoad(Base base,
-                                boolean confirmReplace,
                                 StatusPanel status) {
     // NOTE: null status => function is called on startup
     // when Editor objects, et al. aren't ready
@@ -198,33 +197,9 @@ LocalContribution copyAndLoad(Base base,
           } else {
             int result;
             boolean doBackup = Preferences.getBoolean("contribution.backup.on_install");
-            if (confirmReplace) {
-              if (doBackup) {
-                result = Messages.showYesNoQuestion(editor, "Replace",
-                       "Replace pre-existing \"" + oldContrib.getName() + "\" library?",
-                       "A pre-existing copy of the \"" + oldContrib.getName() + "\" library<br>"+
-                       "has been found in your sketchbook. Clicking “Yes”<br>"+
-                       "will move the existing library to a backup folder<br>" +
-                       "in <i>libraries/old</i> before replacing it.");
-                if (result != JOptionPane.YES_OPTION || !oldContrib.backup(true, status)) {
-                  return null;
-                }
-              } else {
-                result = Messages.showYesNoQuestion(editor, "Replace",
-                       "Replace pre-existing \"" + oldContrib.getName() + "\" library?",
-                       "A pre-existing copy of the \"" + oldContrib.getName() + "\" library<br>"+
-                       "has been found in your sketchbook. Clicking “Yes”<br>"+
-                       "will permanently delete this library and all of its contents<br>"+
-                       "before replacing it.");
-                if (result != JOptionPane.YES_OPTION || !oldContrib.getFolder().delete()) {
-                  return null;
-                }
-              }
-            } else {
-              if ((doBackup && !oldContrib.backup(true, status)) ||
+            if ((doBackup && !oldContrib.backup(true, status)) ||
                   (!doBackup && !oldContrib.getFolder().delete())) {
-                return null;
-              }
+              return null;
             }
           }
         }

todo.txt

@@ -13,6 +13,8 @@ X many more updates to the contribs wiki
 X more contribs manager concurrency problems
 X   https://github.com/processing/processing4/issues/640
 X warn users about multiple libraries with the same name
+X remove unused confirmReplace variable from install() functions for contribs
+_ if contrib (library only?) folder name changes on update, old lib not removed
 _ Updates requiring a reboot give the false impression that they failed (in the updates tab)
 _   https://github.com/processing/processing4/issues/647
 _ lots of folders remaining in 'old' for Modes