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
JAL-3691 automatic insertion of Locale.ROOT to toUpperCase() and toLowerCase() and...
[jalview.git]
/
src
/
jalview
/
gui
/
AppVarnaBinding.java
diff --git
a/src/jalview/gui/AppVarnaBinding.java
b/src/jalview/gui/AppVarnaBinding.java
index
88fc38f
..
7430856
100644
(file)
--- a/
src/jalview/gui/AppVarnaBinding.java
+++ b/
src/jalview/gui/AppVarnaBinding.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-281,15
+281,16
@@
public class AppVarnaBinding extends JalviewVarnaBinding
String name = r.getName();
if (name.equals(""))
{
String name = r.getName();
if (name.equals(""))
{
- name = path.substring(path
- .lastIndexOf(File.separatorChar) + 1);
+ name = path.substring(
+ path.lastIndexOf(File.separatorChar) + 1);
}
if (mdls.size() > 1)
{
name += " (Model " + mn++ + ")";
}
_rnaList.add(varnaPanel.getConfig().clone(), r, name,
}
if (mdls.size() > 1)
{
name += " (Model " + mn++ + ")";
}
_rnaList.add(varnaPanel.getConfig().clone(), r, name,
- true);
+ true);
+ // BH 2018 SwingJS clone of varnaPanel or its config will be the object itself, not a clone
}
}
}
}
}
}
@@
-374,9
+375,9
@@
public class AppVarnaBinding extends JalviewVarnaBinding
_sideList.ensureIndexIsVisible(index);
/*
_sideList.ensureIndexIsVisible(index);
/*
- * TODO Object newName = JOptionPane.showInputDialog( this,
+ * TODO Object newName = JvOptionPane.showInputDialog( this,
* "Specify a new name for this RNA", "Rename RNA",
* "Specify a new name for this RNA", "Rename RNA",
- * JOptionPane.QUESTION_MESSAGE, (Icon)null, null, item.toString()); if
+ * JvOptionPane.QUESTION_MESSAGE, (Icon)null, null, item.toString()); if
* (newName!=null) { item.name = newName.toString();
* this._sideList.repaint(); }
*/
* (newName!=null) { item.name = newName.toString();
* this._sideList.repaint(); }
*/
@@
-384,7
+385,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
}
@Override
}
@Override
- public String[] getPdbFile()
+ public String[] getStructureFiles()
{
return null;
}
{
return null;
}
@@
-545,7
+546,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
*/
public void addStructure(RNA rna)
{
*/
public void addStructure(RNA rna)
{
- VARNAConfig config = vp.getConfig().clone();
+ VARNAConfig config = vp.getConfig().clone(); // BH 2018 this will NOT be a clone in SwingJS
addStructure(rna, config);
}
addStructure(rna, config);
}