From 1026b7a36483fe6fec0a3d90f1496e49dc9b00ad Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 19 May 2005 17:52:55 +0000
Subject: [PATCH] changes to JalviewFileChooser

---
 src/jalview/gui/TreePanel.java          |   19 +++++++++++++------
 src/jalview/gui/UserDefinedColours.java |   20 ++++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 87c4d14..c458638 100755
--- 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);
     if (value == JalviewFileChooser.APPROVE_OPTION) {
       String choice =  chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  chooser.getSelectedFile().getParent());
       try{
         jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
         String output = fout.print(false,true); // distances only
@@ -179,7 +179,10 @@ public class TreePanel extends GTreePanel
     try
     {
       jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(
-          "LAST_DIRECTORY"), new String[]{"eps"}, "Encapsulated Postscript");
+          "LAST_DIRECTORY"),
+              new String[]{"eps"},
+              new String[]{"Encapsulated Postscript"},
+              "Encapsulated Postscript");
       chooser.setFileView(new jalview.io.JalviewFileView());
       chooser.setDialogTitle("Create EPS file from tree");
       chooser.setToolTipText("Save");
@@ -188,7 +191,7 @@ public class TreePanel extends GTreePanel
       if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
         return;
 
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getParent());
       FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
       EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width, height);
 
@@ -209,8 +212,12 @@ public class TreePanel extends GTreePanel
   int width = treeCanvas.getWidth(), height = treeCanvas.getHeight();
     try
     {
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(
-          "LAST_DIRECTORY"), new String[]{"png"}, "Portable network graphics");
+      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
+          jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+          new String[] {"png"},
+          new String[] {"Portable network graphics"},
+          "Portable network graphics");
+
       chooser.setFileView(new jalview.io.JalviewFileView());
       chooser.setDialogTitle("Create PNG image from tree");
       chooser.setToolTipText("Save");
@@ -219,7 +226,7 @@ public class TreePanel extends GTreePanel
       if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
         return;
 
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getParent());
       FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
 
       BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index cd30543..e0167cf 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -131,17 +131,20 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-        new String[]{".jvuc"}, "Jalview User Colours");
+    JalviewFileChooser chooser = new JalviewFileChooser(
+      jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+        new String[]{".jc"},
+        new String[]{"Jalview User Colours"},
+          "Jalview User Colours");
     chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle("Load colour scheme");
     chooser.setToolTipText("Load");
     int value = chooser.showOpenDialog(this);
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
-      loadColour(choice);
+      File choice = chooser.getSelectedFile();
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice.getParent());
+      loadColour(choice.getAbsolutePath());
     }
 
   }
@@ -190,7 +193,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void savebutton_actionPerformed(ActionEvent e)
   {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    JalviewFileChooser chooser = new JalviewFileChooser(
+    jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+    new String[]{".jc"},
+    new String[]{"Jalview User Colours"},
+      "Jalview User Colours");
+
     chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle("Save colour scheme");
     chooser.setToolTipText("Save");
-- 
1.7.10.2