X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppVarnaBinding.java;h=787ed538664149153316150bf6afda264ff0a47e;hb=72fb6df14f1ff426bbafa18dcc9a90450da93018;hp=ee4ef797679b034e96475ebb3234c9823849c194;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/AppVarnaBinding.java b/src/jalview/gui/AppVarnaBinding.java index ee4ef79..787ed53 100644 --- 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 static String errorOpt = "error"; + private final static String errorOpt = "error"; @SuppressWarnings("unused") private boolean _error; @@ -100,7 +100,7 @@ public class AppVarnaBinding extends JalviewVarnaBinding */ private void init() { - DefaultListModel dlm = new DefaultListModel(); + DefaultListModel dlm = new DefaultListModel<>(); int marginTools = 40; @@ -122,6 +122,7 @@ public class AppVarnaBinding extends JalviewVarnaBinding _sideList.setPreferredSize(new Dimension(100, 0)); _sideList.addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent evt) { changeSelectedStructure_actionPerformed(evt); @@ -289,7 +290,8 @@ public class AppVarnaBinding extends JalviewVarnaBinding 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 _rnalist; - private List _rnas = new ArrayList(); + private List _rnas = new ArrayList<>(); JList _l; @@ -545,7 +547,7 @@ public class AppVarnaBinding extends JalviewVarnaBinding */ 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); }