X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppVarnaBinding.java;h=74308564ca8fd5cfaa97403e67f73133e3945d1d;hb=2e57729baa0bc97fc03ab1fb8eb4dbc1a12f3d9a;hp=88fc38fa2cc8686289b2bb437c70ac4605222684;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/jalview/gui/AppVarnaBinding.java b/src/jalview/gui/AppVarnaBinding.java index 88fc38f..7430856 100644 --- 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. * @@ -281,15 +281,16 @@ public class AppVarnaBinding extends JalviewVarnaBinding 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, - 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); /* - * TODO Object newName = JOptionPane.showInputDialog( this, + * TODO Object newName = JvOptionPane.showInputDialog( this, * "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(); } */ @@ -384,7 +385,7 @@ public class AppVarnaBinding extends JalviewVarnaBinding } @Override - public String[] getPdbFile() + public String[] getStructureFiles() { return null; } @@ -545,7 +546,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); }