Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / datamodel / annotations / AnnotationRowBuilder.java

diff --git a/src/jalview/datamodel/annotations/AnnotationRowBuilder.java b/src/jalview/datamodel/annotations/AnnotationRowBuilder.java
index b3d567a..c7e4549 100644 (file)
--- a/src/jalview/datamodel/annotations/AnnotationRowBuilder.java
+++ b/src/jalview/datamodel/annotations/AnnotationRowBuilder.java
@@ -1,7 +1,6 @@
 package jalview.datamodel.annotations;
 
 import jalview.datamodel.Annotation;
-import jalview.structure.StructureImportSettings;
 import jalview.structure.StructureImportSettings.TFType;
 
 public class AnnotationRowBuilder
@@ -18,14 +17,15 @@ public class AnnotationRowBuilder
   /**
    * the type of temperature factor plot (if it is one)
    */
-  private StructureImportSettings.TFType tfType = StructureImportSettings.TFType.DEFAULT;
+  // private TFType tfType = TFType.DEFAULT;
+  private TFType tfType = null;
 
-  public void setTFType(StructureImportSettings.TFType t)
+  public void setTFType(TFType t)
   {
     tfType = t;
   }
 
-  public StructureImportSettings.TFType getTFType()
+  public TFType getTFType()
   {
     return tfType;
   }
@@ -97,7 +97,7 @@ public class AnnotationRowBuilder
     name = string;
   }
 
-  public AnnotationRowBuilder(String name, float min, float max, StructureImportSettings.TFType tft)
+  public AnnotationRowBuilder(String name, float min, float max, TFType tft)
   {
     this(name, min, max);
     setTFType(tft);