From: Jim Procter Date: Fri, 11 Feb 2022 17:27:42 +0000 (+0000) Subject: Merge branch 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' into... X-Git-Tag: Release_2_11_2_0~13^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1db943794a28bdd593776ef14fe5ef9f3cd50ba8;hp=-c;p=jalview.git Merge branch 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' into develop --- 1db943794a28bdd593776ef14fe5ef9f3cd50ba8 diff --combined src/jalview/gui/StructureViewerBase.java index 8ac23ef,8290dd9..349871d --- a/src/jalview/gui/StructureViewerBase.java +++ b/src/jalview/gui/StructureViewerBase.java @@@ -47,6 -47,7 +47,7 @@@ import javax.swing.event.MenuListener import jalview.api.AlignmentViewPanel; import jalview.bin.Cache; + import jalview.bin.Console; import jalview.datamodel.AlignmentI; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; @@@ -814,7 -815,7 +815,7 @@@ public abstract class StructureViewerBa { sp.append("'" + alignPanel.getViewName() + "' "); } - Cache.log.info("Couldn't align structures with the " + sp.toString() + Console.info("Couldn't align structures with the " + sp.toString() + "associated alignment panels.", e); } return reply; @@@ -1160,7 -1161,7 +1161,7 @@@ } else { if (processingEntry.hasRetrievalUrl()) { - String safePDBId = java.net.URLEncoder.encode(pdbid,"UTF-8"); + String safePDBId = java.net.URLEncoder.encode(pdbid,"UTF-8").replace("%","__"); // retrieve from URL to new local tmpfile File tmpFile = File.createTempFile(safePDBId,