From: gmungoc Date: Mon, 12 Dec 2016 19:47:44 +0000 (+0000) Subject: JAL-1544 backgroud -> background X-Git-Tag: Release_2_10_3b1~357^2~63 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ebb1c48911e4c1d3aaff6e98367cd846baa5074b;p=jalview.git JAL-1544 backgroud -> background --- diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 6360dc7..f533a71 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -770,7 +770,7 @@ label.original_data_for_params = Original Data for {0} label.points_for_params = Points for {0} label.transformed_points_for_params = Transformed points for {0} label.graduated_color_for_params = Graduated Feature Colour for {0} -label.select_backgroud_colour = Select Background Colour +label.select_background_colour = Select Background Colour label.invalid_font = Invalid Font label.separate_multiple_accession_ids = Enter one or more accession IDs separated by a semi-colon ";" label.separate_multiple_query_values = Enter one or more {0}s separated by a semi-colon ";" diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties index e5b5e27..dca80a5 100644 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@ -707,7 +707,7 @@ label.original_data_for_params = Datos originales de {0} label.points_for_params = Puntos de {0} label.transformed_points_for_params = Puntos transformados de {0} label.graduated_color_for_params = Color graduado para la característica de {0} -label.select_backgroud_colour = Seleccionar color de fondo +label.select_background_colour = Seleccionar color de fondo label.invalid_font = Fuente no válida label.separate_multiple_accession_ids = Separar los accession id con un punto y coma ";" label.replace_commas_semicolons = Cambiar comas por puntos y comas diff --git a/src/MCview/PDBViewer.java b/src/MCview/PDBViewer.java index f108fc2..1c7a6ee 100755 --- 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 java.awt.Color; 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.util.Map; 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); - if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null) + Map 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( - userColours.nextElement().toString()); + userColour); radioItem.setName("USER_DEFINED"); radioItem.addMouseListener(new MouseAdapter() { @@ -723,7 +724,7 @@ public class PDBViewer extends JInternalFrame implements Runnable } else { - UserColourScheme udc = (UserColourScheme) UserDefinedColours + UserColourScheme udc = UserDefinedColours .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) { - 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) diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index b82eef3..7a8f07c 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -46,6 +46,7 @@ import jalview.util.MessageManager; import jalview.util.Platform; import jalview.ws.dbsources.Pdb; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -66,7 +67,6 @@ import javax.swing.JCheckBoxMenuItem; import javax.swing.JColorChooser; import javax.swing.JInternalFrame; import javax.swing.JMenu; -import javax.swing.JOptionPane; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; import javax.swing.event.MenuEvent; @@ -934,9 +934,9 @@ public class ChimeraViewFrame extends StructureViewerBase @Override public void backGround_actionPerformed(ActionEvent actionEvent) { - java.awt.Color col = JColorChooser - .showDialog(this, MessageManager - .getString("label.select_backgroud_colour"), null); + Color col = JColorChooser.showDialog(this, + MessageManager.getString("label.select_background_colour"), + null); if (col != null) { jmb.setBackgroundColour(col); diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java index 4f5a018..288ef1f 100644 --- a/src/jalview/gui/PCAPanel.java +++ b/src/jalview/gui/PCAPanel.java @@ -46,7 +46,6 @@ import javax.swing.ButtonGroup; import javax.swing.JCheckBoxMenuItem; import javax.swing.JColorChooser; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JRadioButtonMenuItem; /** @@ -172,7 +171,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, public void bgcolour_actionPerformed(ActionEvent e) { Color col = JColorChooser.showDialog(this, - MessageManager.getString("label.select_backgroud_colour"), + MessageManager.getString("label.select_background_colour"), rc.bgColour); if (col != null)