changes to JalviewFileChooser

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 87c4d14..c458638 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -110,7 +110,7 @@ public class TreePanel extends GTreePanel
     int value = chooser.showSaveDialog(null);\r
     if (value == JalviewFileChooser.APPROVE_OPTION) {\r
       String choice =  chooser.getSelectedFile().getPath();\r
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  chooser.getSelectedFile().getParent());\r
       try{\r
         jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());\r
         String output = fout.print(false,true); // distances only\r
@@ -179,7 +179,10 @@ public class TreePanel extends GTreePanel
     try\r
     {\r
       jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(\r
-          "LAST_DIRECTORY"), new String[]{"eps"}, "Encapsulated Postscript");\r
+          "LAST_DIRECTORY"),\r
+              new String[]{"eps"},\r
+              new String[]{"Encapsulated Postscript"},\r
+              "Encapsulated Postscript");\r
       chooser.setFileView(new jalview.io.JalviewFileView());\r
       chooser.setDialogTitle("Create EPS file from tree");\r
       chooser.setToolTipText("Save");\r
@@ -188,7 +191,7 @@ public class TreePanel extends GTreePanel
       if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)\r
         return;\r
 \r
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getParent());\r
       FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());\r
       EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width, height);\r
 \r
@@ -209,8 +212,12 @@ public class TreePanel extends GTreePanel
   int width = treeCanvas.getWidth(), height = treeCanvas.getHeight();\r
     try\r
     {\r
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(\r
-          "LAST_DIRECTORY"), new String[]{"png"}, "Portable network graphics");\r
+      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(\r
+          jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
+          new String[] {"png"},\r
+          new String[] {"Portable network graphics"},\r
+          "Portable network graphics");\r
+\r
       chooser.setFileView(new jalview.io.JalviewFileView());\r
       chooser.setDialogTitle("Create PNG image from tree");\r
       chooser.setToolTipText("Save");\r
@@ -219,7 +226,7 @@ public class TreePanel extends GTreePanel
       if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)\r
         return;\r
 \r
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getParent());\r
       FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());\r
 \r
       BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);\r

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