JAL-1499 patch from Mungo Carstairs

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
old mode 100755 (executable)
new mode 100644 (file)
index 4f52f52..f7d189b
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -20,19 +20,29 @@
  */
 package jalview.gui;
 
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
-import jalview.bin.*;
-import jalview.io.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
+import jalview.bin.Cache;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GPreferences;
+import jalview.jbgui.GSequenceLink;
+import jalview.schemes.ColourSchemeProperty;
 import jalview.util.MessageManager;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.util.Collection;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.JColorChooser;
+import javax.swing.JFileChooser;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
+
 /**
  * DOCUMENT ME!
  * 
@@ -111,7 +121,7 @@ public class Preferences extends GPreferences
 
   DasSourceBrowser dasSource;
 
-  private WsPreferences wsPrefs;
+  private final WsPreferences wsPrefs;
 
   /**
    * Creates a new Preferences object.
@@ -294,6 +304,7 @@ public class Preferences extends GPreferences
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void ok_actionPerformed(ActionEvent e)
   {
 
@@ -461,6 +472,8 @@ public class Preferences extends GPreferences
             Boolean.toString(clustaljv.isSelected()));
     Cache.applicationProperties.setProperty("FASTA_JVSUFFIX",
             Boolean.toString(fastajv.isSelected()));
+    Cache.applicationProperties.setProperty("MEGA_JVSUFFIX",
+            Boolean.toString(megajv.isSelected()));
     Cache.applicationProperties.setProperty("MSF_JVSUFFIX",
             Boolean.toString(msfjv.isSelected()));
     Cache.applicationProperties.setProperty("PFAM_JVSUFFIX",
@@ -500,14 +513,17 @@ public class Preferences extends GPreferences
   /**
    * DOCUMENT ME!
    */
+  @Override
   public void startupFileTextfield_mouseClicked()
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
             new String[]
-            { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "jar" },
+            { "fa, fasta, fastq", "aln", "pfam", "meg", "msf", "pir",
+                "blc", "jar" },
             new String[]
-            { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" },
+            { "Fasta", "Clustal", "PFAM", "MEGA", "MSF", "PIR", "BLC",
+                "Jalview" },
             jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle("Select startup file");
@@ -529,6 +545,7 @@ public class Preferences extends GPreferences
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void cancel_actionPerformed(ActionEvent e)
   {
     try
@@ -547,6 +564,7 @@ public class Preferences extends GPreferences
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void annotations_actionPerformed(ActionEvent e)
   {
     conservation.setEnabled(annotations.isSelected());
@@ -560,6 +578,7 @@ public class Preferences extends GPreferences
             && (identity.isSelected() || showGroupConsensus.isSelected()));
   }
 
+  @Override
   public void newLink_actionPerformed(ActionEvent e)
   {
 
@@ -586,6 +605,7 @@ public class Preferences extends GPreferences
     }
   }
 
+  @Override
   public void editLink_actionPerformed(ActionEvent e)
   {
     GSequenceLink link = new GSequenceLink();
@@ -627,6 +647,7 @@ public class Preferences extends GPreferences
     }
   }
 
+  @Override
   public void deleteLink_actionPerformed(ActionEvent e)
   {
     int index = linkNameList.getSelectedIndex();
@@ -649,6 +670,7 @@ public class Preferences extends GPreferences
     linkURLList.setListData(urlLinks);
   }
 
+  @Override
   public void defaultBrowser_mouseClicked(MouseEvent e)
   {
     JFileChooser chooser = new JFileChooser(".");
@@ -670,6 +692,7 @@ public class Preferences extends GPreferences
    * jalview.jbgui.GPreferences#showunconserved_actionPerformed(java.awt.event
    * .ActionEvent)
    */
+  @Override
   protected void showunconserved_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
@@ -685,6 +708,7 @@ public class Preferences extends GPreferences
     return groupURLLinks;
   }
 
+  @Override
   public void minColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,
@@ -696,6 +720,7 @@ public class Preferences extends GPreferences
     minColour.repaint();
   }
 
+  @Override
   public void maxColour_actionPerformed()
   {
     Color col = JColorChooser.showDialog(this,