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 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
0b2f6cc
..
b1f0edb
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-300,7
+300,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
else if (action.equals(LABEL))
{
String exMesg = collectAnnotVals(anot, LABEL);
else if (action.equals(LABEL))
{
String exMesg = collectAnnotVals(anot, LABEL);
- String label = JOptionPane.showInputDialog(this,
+ String label = JvOptionPane.showInputDialog(this,
MessageManager.getString("label.enter_label"), exMesg);
if (label == null)
MessageManager.getString("label.enter_label"), exMesg);
if (label == null)
@@
-380,7
+380,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
aa[activeRow].hasIcons = true;
}
aa[activeRow].hasIcons = true;
}
- String label = JOptionPane.showInputDialog(MessageManager
+ String label = JvOptionPane.showInputDialog(MessageManager
.getString("label.enter_label_for_the_structure"), symbol);
if (label == null)
.getString("label.enter_label_for_the_structure"), symbol);
if (label == null)
@@
-458,8
+458,8
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
String tlabel = null;
if (anots[index] != null)
{ // LML added stem code
String tlabel = null;
if (anots[index] != null)
{ // LML added stem code
- if (type.equals(HELIX) || type.equals(SHEET)
- || type.equals(STEM) || type.equals(LABEL))
+ if (type.equals(HELIX) || type.equals(SHEET) || type.equals(STEM)
+ || type.equals(LABEL))
{
tlabel = anots[index].description;
if (tlabel == null || tlabel.length() < 1)
{
tlabel = anots[index].description;
if (tlabel == null || tlabel.length() < 1)
@@
-814,8
+814,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
text.append(", ")
.append(MessageManager.getString("label.sequence"))
{
text.append(", ")
.append(MessageManager.getString("label.sequence"))
- .append(" ")
- .append(seqIndex + 1);
+ .append(" ").append(seqIndex + 1);
char residue = seqref.getCharAt(column);
if (!Comparison.isGap(residue))
{
char residue = seqref.getCharAt(column);
if (!Comparison.isGap(residue))
{