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-1544 backgroud -> background
[jalview.git]
/
src
/
MCview
/
PDBViewer.java
diff --git
a/src/MCview/PDBViewer.java
b/src/MCview/PDBViewer.java
index
f108fc2
..
1c7a6ee
100755
(executable)
--- a/
src/MCview/PDBViewer.java
+++ b/
src/MCview/PDBViewer.java
@@
-41,6
+41,7
@@
import jalview.schemes.ZappoColourScheme;
import jalview.util.MessageManager;
import jalview.ws.ebi.EBIFetchClient;
import jalview.util.MessageManager;
import jalview.ws.ebi.EBIFetchClient;
+import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@
-54,6
+55,7
@@
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.PrintWriter;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.PrintWriter;
+import java.util.Map;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem;
@@
-400,15
+402,14
@@
public class PDBViewer extends JInternalFrame implements Runnable
bg.add(buried);
bg.add(user);
bg.add(buried);
bg.add(user);
- if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null)
+ Map<String, UserColourScheme> userColourSchemes = UserDefinedColours
+ .getUserColourSchemes();
+ if (userColourSchemes != null)
{
{
- java.util.Enumeration userColours = jalview.gui.UserDefinedColours
- .getUserColourSchemes().keys();
-
- while (userColours.hasMoreElements())
+ for (String userColour : userColourSchemes.keySet())
{
final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
{
final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
- userColours.nextElement().toString());
+ userColour);
radioItem.setName("USER_DEFINED");
radioItem.addMouseListener(new MouseAdapter()
{
radioItem.setName("USER_DEFINED");
radioItem.addMouseListener(new MouseAdapter()
{
@@
-723,7
+724,7
@@
public class PDBViewer extends JInternalFrame implements Runnable
}
else
{
}
else
{
- UserColourScheme udc = (UserColourScheme) UserDefinedColours
+ UserColourScheme udc = UserDefinedColours
.getUserColourSchemes().get(e.getActionCommand());
pdbcanvas.pdb.setColours(udc);
.getUserColourSchemes().get(e.getActionCommand());
pdbcanvas.pdb.setColours(udc);
@@
-734,8
+735,8
@@
public class PDBViewer extends JInternalFrame implements Runnable
public void background_actionPerformed(ActionEvent e)
{
public void background_actionPerformed(ActionEvent e)
{
- java.awt.Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_backgroud_colour"),
+ Color col = JColorChooser.showDialog(this,
+ MessageManager.getString("label.select_background_colour"),
pdbcanvas.backgroundColour);
if (col != null)
pdbcanvas.backgroundColour);
if (col != null)