From: gmungoc Date: Thu, 13 Nov 2014 16:15:23 +0000 (+0000) Subject: merge X-Git-Tag: Jalview_2_9~156 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d97539352d01f35236e70d4a6950e45f98cbf062;p=jalview.git merge --- diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java index 928bb47..175a249 100644 --- a/src/jalview/structure/StructureSelectionManager.java +++ b/src/jalview/structure/StructureSelectionManager.java @@ -28,7 +28,7 @@ import jalview.datamodel.Annotation; import jalview.datamodel.PDBEntry; import jalview.datamodel.SearchResults; import jalview.datamodel.SequenceI; -import jalview.io.FormatAdapter; +import jalview.io.AppletFormatAdapter; import jalview.util.MessageManager; import java.io.PrintStream; @@ -276,7 +276,7 @@ public class StructureSelectionManager { pdb = new MCview.PDBfile(true, parseSecStr, pdbFile, protocol); if (pdb.id != null && pdb.id.trim().length() > 0 - && FormatAdapter.FILE.equals(protocol)) + && AppletFormatAdapter.FILE.equals(protocol)) { registerPDBFile(pdb.id.trim(), pdbFile); } @@ -360,13 +360,11 @@ public class StructureSelectionManager + maxChain.residues.size() + "\n\n"); PrintStream ps = new PrintStream(System.out) { - @Override public void print(String x) { mappingDetails.append(x); } - @Override public void println() { mappingDetails.append("\n");