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_1_Branch' into JAL-1372_referenceseq
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
d9512d0
..
81b88ac
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-200,8
+200,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
public void itemStateChanged(ItemEvent e)
{
alignStructs.setEnabled(_alignwith.size() > 0);
public void itemStateChanged(ItemEvent e)
{
alignStructs.setEnabled(_alignwith.size() > 0);
- alignStructs.setToolTipText("Align structures using "
- + _alignwith.size() + " linked alignment views");
+ alignStructs.setToolTipText(MessageManager.formatMessage("label.align_structures_using_linked_alignment_views", new String[] {new Integer(_alignwith.size()).toString()}));
\r
}
});
handler.itemStateChanged(null);
}
});
handler.itemStateChanged(null);
@@
-618,7
+617,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
{
return;
}
{
return;
}
- JMenuItem menuItem = new JMenuItem("All");
+ JMenuItem menuItem = new JMenuItem(MessageManager.getString("label.all"));
\r
menuItem.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
menuItem.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
@@
-830,7
+829,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
// need to wait around until script has finished
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
// need to wait around until script has finished
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
- : (jmb.isFinishedInit() && jmb.getPdbFile().length != jmb.pdbentry.length))
+ : (jmb.isFinishedInit() && jmb.getPdbFile()!=null && jmb.getPdbFile().length != jmb.pdbentry.length))
{
try
{
{
try
{
@@
-872,7
+871,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Save PDB File");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Save PDB File");
- chooser.setToolTipText("Save");
+ chooser.setToolTipText(MessageManager.getString("action.save"));
\r
int value = chooser.showSaveDialog(this);
int value = chooser.showSaveDialog(this);
@@
-920,7
+919,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
cap.dispose();
return;
}
cap.dispose();
return;
}
- jalview.gui.Desktop.addInternalFrame(cap, "PDB - Sequence Mapping",
+ jalview.gui.Desktop.addInternalFrame(cap, MessageManager.getString("label.pdb_sequence_mapping"),
\r
550, 600);
}
550, 600);
}