Merge branch 'develop' into Jalview-JS/develop

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a9d5b86..e2c3ac3 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -851,7 +851,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         Desktop.instance.removeJalviewPropertyChangeListener("services",
                 thisListener);
         closeMenuItem_actionPerformed(true);
-      };
+      }
     });
     // Finally, build the menu once to get current service state
     new Thread(new Runnable()
@@ -1004,11 +1004,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void setStatus(String text)
   {
-         // BH note: If text width and height are 0, then the layout manager
-         // will dispense of it and change the frame height. 
-         // In JavaScript, we use \u00A0  -- unicode "non-breaking space"
-         // which is the unicode encoding of  
-         
     statusBar.setText(text == null || text.isEmpty() ? " " : text);
   }
 
@@ -1289,10 +1284,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         else
         {
           // create backupfiles object and get new temp filename destination
-          BackupFiles backupfiles = new BackupFiles(file);
+          boolean doBackup = BackupFiles.getEnabled();
+          BackupFiles backupfiles = doBackup ? new BackupFiles(file) : null;
           try
           {
-            String tempFilePath = backupfiles.getTempFilePath();
+            String tempFilePath = doBackup ? backupfiles.getTempFilePath() : file;
                        PrintWriter out = new PrintWriter(
                     new FileWriter(tempFilePath));
 
@@ -1302,15 +1298,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             statusBar.setText(MessageManager.formatMessage(
                   "label.successfully_saved_to_file_in_format", new Object[]
                   { fileName, format.getName() }));
+            lastSaveSuccessful = true;
           } catch (Exception ex)
           {
             lastSaveSuccessful = false;
             ex.printStackTrace();
           }
 
-          backupfiles.setWriteSuccess(lastSaveSuccessful);
-          // do the backup file roll and rename the temp file to actual file
-          lastSaveSuccessful = backupfiles.rollBackupsAndRenameTempFile();
+          if (doBackup)
+          {
+            backupfiles.setWriteSuccess(lastSaveSuccessful);
+            // do the backup file roll and rename the temp file to actual file
+            lastSaveSuccessful = backupfiles.rollBackupsAndRenameTempFile();
+          }
         }
       }
     };
@@ -3369,7 +3369,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
               {
                 overview.dispose();
                 alignPanel.setOverviewPanel(null);
-              };
+              }
             });
     if (getKeyListeners().length > 0)
     {
@@ -5004,7 +5004,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         trimrs.setSelected(trimrs.isSelected());
         Cache.setProperty(DBRefFetcher.TRIM_RETRIEVED_SEQUENCES,
                 Boolean.valueOf(trimrs.isSelected()).toString());
-      };
+      }
     });
     rfetch.add(trimrs);
     JMenuItem fetchr = new JMenuItem(
@@ -5733,7 +5733,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         Cache.setProperty("LAST_DIRECTORY", choice);
         SequenceI[] seqs = viewport.getAlignment().getSequencesArray();
         new VCFLoader(choice).loadVCF(seqs, us);
-      };
+      }
     });
     chooser.showOpenDialog(null);