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
JAL-1691 linked scrollling in split frame (Desktop)
[jalview.git]
/
src
/
jalview
/
appletgui
/
UserDefinedColours.java
diff --git
a/src/jalview/appletgui/UserDefinedColours.java
b/src/jalview/appletgui/UserDefinedColours.java
index
a59a772
..
342c065
100644
(file)
--- a/
src/jalview/appletgui/UserDefinedColours.java
+++ b/
src/jalview/appletgui/UserDefinedColours.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-187,7
+187,7
@@
public class UserDefinedColours extends Panel implements ActionListener,
setTargetColour(colour);
okcancelPanel.setBounds(new Rectangle(0, 113, 400, 35));
setTargetColour(colour);
okcancelPanel.setBounds(new Rectangle(0, 113, 400, 35));
- frame.setTitle("User Defined Colours - " + label);
+ frame.setTitle(MessageManager.getString("label.user_defined_colours") + " - " + label);
frame.setSize(420, 200);
}
frame.setSize(420, 200);
}
@@
-206,7
+206,7
@@
public class UserDefinedColours extends Panel implements ActionListener,
// // not 1.1 compatible!
// dialog = new Dialog(((JVDialog)alignframe), title, true);
// } else {
// // not 1.1 compatible!
// dialog = new Dialog(((JVDialog)alignframe), title, true);
// } else {
- throw new Error("Unsupported owner for User Colour scheme dialog.");
+ throw new Error(MessageManager.getString("label.error_unsupported_owwner_user_colour_scheme"));
}
dialog.add(this);
}
dialog.add(this);
@@
-278,7
+278,8
@@
public class UserDefinedColours extends Panel implements ActionListener,
}
frame = new Frame();
frame.add(this);
}
frame = new Frame();
frame.add(this);
- jalview.bin.JalviewLite.addFrame(frame, MessageManager.getString("label.user_defined_colours"), 420,
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("label.user_defined_colours"), 420,
345);
if (seqGroup != null)
345);
if (seqGroup != null)
@@
-426,7
+427,9
@@
public class UserDefinedColours extends Panel implements ActionListener,
{
applyButton_actionPerformed();
if (dialog != null)
{
applyButton_actionPerformed();
if (dialog != null)
+ {
dialog.setVisible(false);
dialog.setVisible(false);
+ }
frame.setVisible(false);
}
frame.setVisible(false);
}
@@
-488,7
+491,7
@@
public class UserDefinedColours extends Panel implements ActionListener,
UserColourScheme ucs = new UserColourScheme(newColours);
if (ap != null)
{
UserColourScheme ucs = new UserColourScheme(newColours);
if (ap != null)
{
- ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
+ ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
}
if (ap != null)
}
if (ap != null)
@@
-556,7
+559,9
@@
public class UserDefinedColours extends Panel implements ActionListener,
}
}
if (dialog != null)
}
}
if (dialog != null)
+ {
dialog.setVisible(false);
dialog.setVisible(false);
+ }
frame.setVisible(false);
return;
frame.setVisible(false);
return;