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 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignFrame.java
diff --git
a/src/jalview/appletgui/AlignFrame.java
b/src/jalview/appletgui/AlignFrame.java
index
a233c68
..
c6e5032
100644
(file)
--- a/
src/jalview/appletgui/AlignFrame.java
+++ b/
src/jalview/appletgui/AlignFrame.java
@@
-419,7
+419,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
viewport.featureSettings.refreshTable();
}
alignPanel.paintAlignment(true, true);
viewport.featureSettings.refreshTable();
}
alignPanel.paintAlignment(true, true);
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.getString("label.successfully_added_features_alignment"));
}
return featuresFile;
.getString("label.successfully_added_features_alignment"));
}
return featuresFile;
@@
-577,7
+577,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
case KeyEvent.VK_F2:
viewport.cursorMode = !viewport.cursorMode;
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
.formatMessage("label.keyboard_editing_mode", new String[]
{ (viewport.cursorMode ? "on" : "off") }));
if (viewport.cursorMode)
@@
-2090,7
+2090,8
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
seqs, 0, viewport.getAlignment().getWidth(),
viewport.getAlignment()));
seqs, 0, viewport.getAlignment().getWidth(),
viewport.getAlignment()));
- viewport.getRanges().setEndSeq(viewport.getAlignment().getHeight());
+ viewport.getRanges().setEndSeq(viewport.getAlignment().getHeight() - 1); // BH
+ // 2019.04.18
viewport.getAlignment().getWidth();
viewport.firePropertyChange("alignment", null,
viewport.getAlignment().getSequences());
viewport.getAlignment().getWidth();
viewport.firePropertyChange("alignment", null,
viewport.getAlignment().getSequences());
@@
-2366,7
+2367,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
column, al);
}
column, al);
}
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
addHistoryItem(trimRegion);
.formatMessage("label.removed_columns", new String[]
{ Integer.valueOf(trimRegion.getSize()).toString() }));
addHistoryItem(trimRegion);
@@
-2410,7
+2411,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
addHistoryItem(removeGapCols);
addHistoryItem(removeGapCols);
- statusBar.setText(MessageManager
+ setStatus(MessageManager
.formatMessage("label.removed_empty_columns", new String[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
.formatMessage("label.removed_empty_columns", new String[]
{ Integer.valueOf(removeGapCols.getSize()).toString() }));
@@
-3856,7
+3857,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
*/
statusBar.setBackground(Color.white);
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
*/
statusBar.setBackground(Color.white);
statusBar.setFont(new java.awt.Font("Verdana", 0, 11));
- statusBar.setText(MessageManager.getString("label.status_bar"));
+ setStatus(MessageManager.getString("label.status_bar"));
this.add(statusBar, BorderLayout.SOUTH);
}
this.add(statusBar, BorderLayout.SOUTH);
}
@@
-4224,7
+4225,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
}
else
{
}
else
{
- new MCview.AppletPDBViewer(pdb, seqs, chains, alignPanel, protocol);
+ new mc_view.AppletPDBViewer(pdb, seqs, chains, alignPanel, protocol);
}
}
}
}