null pointer in wrapped mode, click near sequence

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index a6b1066..2243a3d 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -18,8 +18,6 @@
  */\r
 package jalview.gui;\r
 \r
-import jalview.bin.*;\r
-\r
 import jalview.io.*;\r
 \r
 import jalview.jbgui.*;\r
@@ -81,7 +79,7 @@ public class Preferences extends GPreferences
         Desktop.addInternalFrame(frame, "Preferences", 480, 390);\r
         frame.setMinimumSize(new Dimension(480,390));\r
 \r
-        fullID.setSelected(      Cache.getDefault("SHOW_FULL_ID", true));\r
+        seqLimit.setSelected(    Cache.getDefault("SHOW_JVSUFFIX", true));\r
         fullScreen.setSelected(  Cache.getDefault("SHOW_FULLSCREEN", false));\r
         annotations.setSelected( Cache.getDefault("SHOW_ANNOTATIONS", true));\r
 \r
@@ -142,6 +140,14 @@ public class Preferences extends GPreferences
         epsRendering.addItem("Text");\r
         epsRendering.setSelectedItem( Cache.getDefault("EPS_RENDERING", "Prompt each time"));\r
 \r
+        blcjv.setSelected( Cache.getDefault("BLC_JVSUFFIX", true) );\r
+        clustaljv.setSelected( Cache.getDefault("CLUSTAL_JVSUFFIX", true) );\r
+        fastajv.setSelected( Cache.getDefault("FASTA_JVSUFFIX", true) );\r
+        msfjv.setSelected( Cache.getDefault("MSF_JVSUFFIX", true) );\r
+        pfamjv.setSelected( Cache.getDefault("PFAM_JVSUFFIX", true) );\r
+        pileupjv.setSelected( Cache.getDefault("PILEUP_JVSUFFIX", true) );\r
+        pirjv.setSelected( Cache.getDefault("PIR_JVSUFFIX", true) );\r
+\r
   /****************************************************\r
    * Set up Connections\r
    */\r
@@ -183,7 +189,7 @@ public class Preferences extends GPreferences
     public void ok_actionPerformed(ActionEvent e)\r
     {\r
 \r
-      Cache.applicationProperties.setProperty("SHOW_FULL_ID", Boolean.toString(fullID.isSelected()));\r
+      Cache.applicationProperties.setProperty("SHOW_JVSUFFIX", Boolean.toString(seqLimit.isSelected()));\r
       Cache.applicationProperties.setProperty("SHOW_FULLSCREEN", Boolean.toString(fullScreen.isSelected()));\r
 \r
       Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", Boolean.toString(annotations.isSelected()));\r
@@ -259,6 +265,14 @@ public class Preferences extends GPreferences
         }\r
 \r
 \r
+        Cache.applicationProperties.setProperty("BLC_JVSUFFIX", Boolean.toString(blcjv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("CLUSTAL_JVSUFFIX", Boolean.toString(clustaljv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("FASTA_JVSUFFIX", Boolean.toString(fastajv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("MSF_JVSUFFIX", Boolean.toString(msfjv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("PFAM_JVSUFFIX", Boolean.toString(pfamjv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("PILEUP_JVSUFFIX", Boolean.toString(pileupjv.isSelected()) );\r
+        Cache.applicationProperties.setProperty("PIR_JVSUFFIX", Boolean.toString(pirjv.isSelected()) );\r
+\r
 \r
         Cache.saveProperties();\r
         try\r