X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=25820c95bbf3cd602e476070ce8c2b9e8c911fde;hb=e7ed63f1ea56432246a6ed1553f0fe56d26f56ea;hp=a4095493b9fb8212a5c6483fa004367d6d039d31;hpb=3647f2e6c679ed5ef3e673f10a8d1afb2882014e;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index a409549..25820c9 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -2,6 +2,7 @@ package jalview.gui;
 
 import jalview.jbgui.GUserDefinedColours;
 import jalview.datamodel.*;
+import jalview.io.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -72,7 +73,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
 
     try{
-      col = oldColourScheme.findColour(aa, -1, null);
+      col = oldColourScheme.findColour(aa, -1);
     }catch(Exception ex){}
 
     button.setBackground(  col );
@@ -118,16 +119,18 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     else
       ap.av.setGlobalColourScheme(ucs);
 
-    ap.RefreshPanels();
+    ap.repaint();
   }
 
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+        new String[]{".jvuc"}, "Jalview User Colours");
+    chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle("Load colour scheme");
     chooser.setToolTipText("Load");
     int value = chooser.showOpenDialog(this);
-    if (value == JFileChooser.APPROVE_OPTION)
+    if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
       jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
@@ -155,11 +158,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void savebutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle("Save colour scheme");
     chooser.setToolTipText("Save");
     int value = chooser.showSaveDialog(this);
-    if (value == JFileChooser.APPROVE_OPTION)
+    if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
       jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
@@ -196,7 +200,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     else
       ap.av.setGlobalColourScheme(ucs);
 
-    ap.RefreshPanels();
+    ap.repaint();
 
   }