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
Merge branch 'Release_2_8_2_Branch' into JAL-1483_featureBasedTreeCalc
[jalview.git]
/
src
/
MCview
/
PDBViewer.java
diff --git
a/src/MCview/PDBViewer.java
b/src/MCview/PDBViewer.java
index
b802708
..
eb214ac
100755
(executable)
--- a/
src/MCview/PDBViewer.java
+++ b/
src/MCview/PDBViewer.java
@@
-295,7
+295,8
@@
public class PDBViewer extends JInternalFrame implements Runnable
}
});
viewMenu.setText(MessageManager.getString("action.view"));
}
});
viewMenu.setText(MessageManager.getString("action.view"));
- background.setText(MessageManager.getString("label.background_colour") + "...");
+ background.setText(MessageManager.getString("label.background_colour")
+ + "...");
background.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
background.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-365,8
+366,10
@@
public class PDBViewer extends JInternalFrame implements Runnable
int option = JOptionPane.showInternalConfirmDialog(
jalview.gui.Desktop.desktop,
int option = JOptionPane.showInternalConfirmDialog(
jalview.gui.Desktop.desktop,
- MessageManager.getString("label.remove_from_default_list"),
- MessageManager.getString("label.remove_user_defined_colour"),
+ MessageManager
+ .getString("label.remove_from_default_list"),
+ MessageManager
+ .getString("label.remove_user_defined_colour"),
JOptionPane.YES_NO_OPTION);
if (option == JOptionPane.YES_OPTION)
{
JOptionPane.YES_NO_OPTION);
if (option == JOptionPane.YES_OPTION)
{
@@
-567,7
+570,9
@@
public class PDBViewer extends JInternalFrame implements Runnable
try
{
cap.setText(pdbcanvas.mappingDetails.toString());
try
{
cap.setText(pdbcanvas.mappingDetails.toString());
- Desktop.addInternalFrame(cap, MessageManager.getString("label.pdb_sequence_mapping"), 550, 600);
+ Desktop.addInternalFrame(cap,
+ MessageManager.getString("label.pdb_sequence_mapping"), 550,
+ 600);
} catch (OutOfMemoryError oom)
{
new OOMWarning("Opening sequence to structure mapping report", oom);
} catch (OutOfMemoryError oom)
{
new OOMWarning("Opening sequence to structure mapping report", oom);
@@
-630,7
+635,8
@@
public class PDBViewer extends JInternalFrame implements Runnable
public void user_actionPerformed(ActionEvent e)
{
public void user_actionPerformed(ActionEvent e)
{
- if (e.getActionCommand().equals(MessageManager.getString("action.user_defined")))
+ if (e.getActionCommand().equals(
+ MessageManager.getString("action.user_defined")))
{
// new UserDefinedColours(pdbcanvas, null);
}
{
// new UserDefinedColours(pdbcanvas, null);
}
@@
-648,7
+654,8
@@
public class PDBViewer extends JInternalFrame implements Runnable
public void background_actionPerformed(ActionEvent e)
{
java.awt.Color col = JColorChooser.showDialog(this,
public void background_actionPerformed(ActionEvent e)
{
java.awt.Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_backgroud_colour"), pdbcanvas.backgroundColour);
+ MessageManager.getString("label.select_backgroud_colour"),
+ pdbcanvas.backgroundColour);
if (col != null)
{
if (col != null)
{