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
Jalview-JS/JAL-3253-applet
[jalview.git]
/
src
/
jalview
/
gui
/
AppVarnaBinding.java
diff --git
a/src/jalview/gui/AppVarnaBinding.java
b/src/jalview/gui/AppVarnaBinding.java
index
829fc3e
..
787ed53
100644
(file)
--- a/
src/jalview/gui/AppVarnaBinding.java
+++ b/
src/jalview/gui/AppVarnaBinding.java
@@
-72,7
+72,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
private ReorderableJList _sideList = null;
private ReorderableJList _sideList = null;
- private static String errorOpt = "error";
+ private final static String errorOpt = "error";
@SuppressWarnings("unused")
private boolean _error;
@SuppressWarnings("unused")
private boolean _error;
@@
-100,7
+100,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
*/
private void init()
{
*/
private void init()
{
- DefaultListModel<FullBackup> dlm = new DefaultListModel<FullBackup>();
+ DefaultListModel<FullBackup> dlm = new DefaultListModel<>();
int marginTools = 40;
int marginTools = 40;
@@
-122,6
+122,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
_sideList.setPreferredSize(new Dimension(100, 0));
_sideList.addListSelectionListener(new ListSelectionListener()
{
_sideList.setPreferredSize(new Dimension(100, 0));
_sideList.addListSelectionListener(new ListSelectionListener()
{
+ @Override
public void valueChanged(ListSelectionEvent evt)
{
changeSelectedStructure_actionPerformed(evt);
public void valueChanged(ListSelectionEvent evt)
{
changeSelectedStructure_actionPerformed(evt);
@@
-281,15
+282,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
}
}
}
}
}
}
@@
-315,7
+317,7
@@
public class AppVarnaBinding extends JalviewVarnaBinding
{
private DefaultListModel<FullBackup> _rnalist;
{
private DefaultListModel<FullBackup> _rnalist;
- private List<RNA> _rnas = new ArrayList<RNA>();
+ private List<RNA> _rnas = new ArrayList<>();
JList _l;
JList _l;
@@
-545,7
+547,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);
}