git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filefilter added
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
a409549
..
8398643
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-2,6
+2,7
@@
package jalview.gui;
\r
import jalview.jbgui.GUserDefinedColours;
\r
import jalview.datamodel.*;
\r
\r
import jalview.jbgui.GUserDefinedColours;
\r
import jalview.datamodel.*;
\r
+import jalview.io.*;
\r
import javax.swing.*;
\r
import java.awt.*;
\r
import java.awt.event.*;
\r
import javax.swing.*;
\r
import java.awt.*;
\r
import java.awt.event.*;
\r
@@
-123,11
+124,13
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
\r
protected void loadbutton_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void loadbutton_actionPerformed(ActionEvent e)
\r
{
\r
- JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
\r
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
\r
+ new String[]{".jvuc"}, "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
chooser.setDialogTitle("Load colour scheme");
\r
chooser.setToolTipText("Load");
\r
int value = chooser.showOpenDialog(this);
\r
- if (value == JFileChooser.APPROVE_OPTION)
\r
+ if (value == JalviewFileChooser.APPROVE_OPTION)
\r
{
\r
String choice = chooser.getSelectedFile().getPath();
\r
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
\r
{
\r
String choice = chooser.getSelectedFile().getPath();
\r
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
\r
@@
-155,11
+158,12
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
\r
protected void savebutton_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void savebutton_actionPerformed(ActionEvent e)
\r
{
\r
- JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
\r
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
\r
+ chooser.setFileView(new jalview.io.JalviewFileView());
\r
chooser.setDialogTitle("Save colour scheme");
\r
chooser.setToolTipText("Save");
\r
int value = chooser.showSaveDialog(this);
\r
chooser.setDialogTitle("Save colour scheme");
\r
chooser.setToolTipText("Save");
\r
int value = chooser.showSaveDialog(this);
\r
- if (value == JFileChooser.APPROVE_OPTION)
\r
+ if (value == JalviewFileChooser.APPROVE_OPTION)
\r
{
\r
String choice = chooser.getSelectedFile().getPath();
\r
jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
\r
{
\r
String choice = chooser.getSelectedFile().getPath();
\r
jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
\r