changes to JalviewFileChooser

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

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index cd30543..e0167cf 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -131,17 +131,20 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 \r
   protected void loadbutton_actionPerformed(ActionEvent e)\r
   {\r
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
-        new String[]{".jvuc"}, "Jalview User Colours");\r
+    JalviewFileChooser chooser = new JalviewFileChooser(\r
+      jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
+        new String[]{".jc"},\r
+        new String[]{"Jalview User Colours"},\r
+          "Jalview User Colours");\r
     chooser.setFileView(new jalview.io.JalviewFileView());\r
     chooser.setDialogTitle("Load colour scheme");\r
     chooser.setToolTipText("Load");\r
     int value = chooser.showOpenDialog(this);\r
     if (value == JalviewFileChooser.APPROVE_OPTION)\r
     {\r
-      String choice = chooser.getSelectedFile().getPath();\r
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);\r
-      loadColour(choice);\r
+      File choice = chooser.getSelectedFile();\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice.getParent());\r
+      loadColour(choice.getAbsolutePath());\r
     }\r
 \r
   }\r
@@ -190,7 +193,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 \r
   protected void savebutton_actionPerformed(ActionEvent e)\r
   {\r
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+    JalviewFileChooser chooser = new JalviewFileChooser(\r
+    jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
+    new String[]{".jc"},\r
+    new String[]{"Jalview User Colours"},\r
+      "Jalview User Colours");\r
+\r
     chooser.setFileView(new jalview.io.JalviewFileView());\r
     chooser.setDialogTitle("Save colour scheme");\r
     chooser.setToolTipText("Save");\r