X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCrossRefAction.java;fp=src%2Fjalview%2Fgui%2FCrossRefAction.java;h=d518d6b289b6fc2ea5f15b09bc1ba3fcc1918604;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=cc256967800d0e627677dc1f0b01bbfe2819a06f;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/gui/CrossRefAction.java b/src/jalview/gui/CrossRefAction.java index cc25696..d518d6b 100644 --- a/src/jalview/gui/CrossRefAction.java +++ b/src/jalview/gui/CrossRefAction.java @@ -25,6 +25,7 @@ import jalview.analysis.CrossRef; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureSettingsModelI; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefEntry; @@ -114,7 +115,8 @@ public class CrossRefAction implements Runnable if (dna && AlignmentUtils.looksLikeEnsembl(alignment)) { - // override default featureColourScheme so products have Ensembl variant colours + // override default featureColourScheme so products have Ensembl variant + // colours featureColourScheme = new SequenceFetcher() .getFeatureColourScheme(DBRefSource.ENSEMBL); } @@ -205,7 +207,8 @@ public class CrossRefAction implements Runnable * and for JAL-3330 also to original alignFrame view(s) * this currently trashes any original settings. */ - for (AlignmentViewPanel origpanel: alignFrame.getAlignPanels()) { + for (AlignmentViewPanel origpanel : alignFrame.getAlignPanels()) + { origpanel.getAlignViewport() .mergeFeaturesStyle(featureColourScheme); } @@ -229,7 +232,7 @@ public class CrossRefAction implements Runnable new OOMWarning("whilst fetching crossreferences", e); } catch (Throwable e) { - Cache.log.error("Error when finding crossreferences", e); + Console.error("Error when finding crossreferences", e); } finally { alignFrame.setProgressBar(MessageManager.formatMessage( @@ -292,9 +295,9 @@ public class CrossRefAction implements Runnable { return; } - + Set ensemblDivisions = new EnsemblInfo().getDivisions(); - + /* * first look for direct dbrefs from sequence to Ensembl */ @@ -450,8 +453,7 @@ public class CrossRefAction implements Runnable copyAlignment = AlignmentUtils.makeCopyAlignment(sel, xrefs.getSequencesArray(), dataset); } - copyAlignment - .setGapCharacter(alignFrame.viewport.getGapCharacter()); + copyAlignment.setGapCharacter(alignFrame.viewport.getGapCharacter()); StructureSelectionManager ssm = StructureSelectionManager .getStructureSelectionManager(Desktop.getInstance()); @@ -464,8 +466,7 @@ public class CrossRefAction implements Runnable if (copyAlignment.getHeight() <= 0) { - System.err.println( - "No Sequences generated for xRef type " + source); + System.err.println("No Sequences generated for xRef type " + source); return null; }