X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCrossRefAction.java;h=c15cf2d9b7963ed42d9969307380de4b98d9f5cf;hb=fa9da54fb97cb2eacb1af7859024d90166bddb8f;hp=974a6e5bf62e29d7ff20c6fa3b5c3c9f04352afb;hpb=17e4ea278bc9a5fb280db1252ce78b7a295215f5;p=jalview.git

diff --git a/src/jalview/gui/CrossRefAction.java b/src/jalview/gui/CrossRefAction.java
index 974a6e5..c15cf2d 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;
@@ -39,6 +40,7 @@ import jalview.util.DBRefUtils;
 import jalview.util.MapList;
 import jalview.util.MappingUtils;
 import jalview.util.MessageManager;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 import jalview.ws.SequenceFetcher;
 
 import java.util.ArrayList;
@@ -113,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);
       }
@@ -177,17 +180,17 @@ public class CrossRefAction implements Runnable
               .isShowSequenceFeatures();
       newFrame.setShowSeqFeatures(showSequenceFeatures);
       copyThis.setShowSeqFeatures(showSequenceFeatures);
-      FeatureRenderer myFeatureStyling = alignFrame.alignPanel
+      FeatureRendererModel myFeatureStyling = alignFrame.alignPanel
               .getSeqPanel().seqCanvas.getFeatureRenderer();
 
       /*
        * copy feature rendering settings to split frame
        */
-      FeatureRenderer fr1 = newFrame.alignPanel.getSeqPanel().seqCanvas
+      FeatureRendererModel fr1 = newFrame.alignPanel.getSeqPanel().seqCanvas
               .getFeatureRenderer();
       fr1.transferSettings(myFeatureStyling);
       fr1.findAllFeatures(true);
-      FeatureRenderer fr2 = copyThis.alignPanel.getSeqPanel().seqCanvas
+      FeatureRendererModel fr2 = copyThis.alignPanel.getSeqPanel().seqCanvas
               .getFeatureRenderer();
       fr2.transferSettings(myFeatureStyling);
       fr2.findAllFeatures(true);
@@ -204,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);
       }
@@ -228,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(
@@ -291,9 +295,9 @@ public class CrossRefAction implements Runnable
     {
       return;
     }
-    
+
     Set<String> ensemblDivisions = new EnsemblInfo().getDivisions();
-    
+
     /*
      * first look for direct dbrefs from sequence to Ensembl
      */
@@ -449,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.instance);
@@ -463,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;
     }