Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / ext / ensembl / EnsemblGene.java

diff --git a/src/jalview/ext/ensembl/EnsemblGene.java b/src/jalview/ext/ensembl/EnsemblGene.java
index 0e3d84b..ae85b45 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblGene.java
+++ b/src/jalview/ext/ensembl/EnsemblGene.java
@@ -55,7 +55,7 @@ public class EnsemblGene extends EnsemblSeqProxy
    * accepts anything as we will attempt lookup of gene or 
    * transcript id or gene name
    */
-  private static final Regex ACCESSION_REGEX = new Regex(".*");
+  private static final Regex ACCESSION_REGEX = Platform.newRegex(".*");
 
   private static final EnsemblFeatureType[] FEATURES_TO_FETCH = {
       EnsemblFeatureType.gene, EnsemblFeatureType.transcript,
@@ -151,7 +151,7 @@ public class EnsemblGene extends EnsemblSeqProxy
       {
         continue;
       }
-      
+
       if (geneAlignment.getHeight() == 1)
       {
         // ensure id has 'correct' case for the Ensembl identifier
@@ -318,8 +318,8 @@ public class EnsemblGene extends EnsemblSeqProxy
         SequenceOntologyI.NMD_TRANSCRIPT_VARIANT,
         SequenceOntologyI.TRANSCRIPT, SequenceOntologyI.EXON,
         SequenceOntologyI.CDS };
-    List<SequenceFeature> sfs = gene.getFeatures().getFeaturesByOntology(
-            soTerms);
+    List<SequenceFeature> sfs = gene.getFeatures()
+            .getFeaturesByOntology(soTerms);
     for (SequenceFeature sf : sfs)
     {
       gene.deleteFeature(sf);
@@ -469,8 +469,9 @@ public class EnsemblGene extends EnsemblSeqProxy
       transcriptLoci.add(geneMapping.locateInTo(exon[0], exon[1]));
     }
 
-    List<int[]> transcriptRange = Arrays.asList(new int[] {
-        transcript.getStart(), transcript.getEnd() });
+    List<int[]> transcriptRange = Arrays
+            .asList(new int[]
+            { transcript.getStart(), transcript.getEnd() });
     MapList mapList = new MapList(transcriptRange, transcriptLoci, 1, 1);
 
     transcript.setGeneLoci(loci.getSpeciesId(), loci.getAssemblyId(),
@@ -578,7 +579,7 @@ public class EnsemblGene extends EnsemblSeqProxy
   @Override
   protected boolean retainFeature(SequenceFeature sf, String accessionId)
   {
-    SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+    SequenceOntologyI so = SequenceOntologyFactory.getSequenceOntology();
     String type = sf.getType();
     if (so.isA(type, SequenceOntologyI.GENE))
     {
@@ -625,13 +626,13 @@ public class EnsemblGene extends EnsemblSeqProxy
   {
     return new FeatureSettingsAdapter()
     {
-      SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+      SequenceOntologyI so = SequenceOntologyFactory.getSequenceOntology();
 
       @Override
-      public boolean isFeatureDisplayed(String type)
+      public boolean isFeatureHidden(String type)
       {
-        return (so.isA(type, SequenceOntologyI.EXON)
-                || so.isA(type, SequenceOntologyI.SEQUENCE_VARIANT));
+        return (!so.isA(type, SequenceOntologyI.EXON)
+                && !so.isA(type, SequenceOntologyI.SEQUENCE_VARIANT));
       }
 
       @Override