JAL-629 refactoring TFType. Remove i18n identification of annotation.

[jalview.git] / src / jalview / ext / jmol / JmolParser.java

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index 9306388..37b3d68 100644 (file)
--- a/src/jalview/ext/jmol/JmolParser.java
+++ b/src/jalview/ext/jmol/JmolParser.java
@@ -40,7 +40,6 @@ import com.stevesoft.pat.Regex;
 import jalview.bin.Console;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentAnnotation.TFType;
 import jalview.datamodel.Annotation;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
@@ -50,6 +49,7 @@ import jalview.io.DataSourceType;
 import jalview.io.FileParse;
 import jalview.io.StructureFile;
 import jalview.schemes.ResidueProperties;
+import jalview.structure.StructureImportSettings;
 import jalview.util.Format;
 import jalview.util.MessageManager;
 import jalview.ws.dbsources.EBIAlfaFold;
@@ -84,7 +84,7 @@ public class JmolParser extends StructureFile implements JmolStatusListener
   }
 
   public JmolParser(Object inFile, DataSourceType sourceType,
-          AlignmentAnnotation.TFType tempfacType) throws IOException
+          StructureImportSettings.TFType tempfacType) throws IOException
   {
     super(inFile, sourceType, tempfacType);
   }
@@ -251,8 +251,8 @@ public class JmolParser extends StructureFile implements JmolStatusListener
         {
           AnnotationRowBuilder builder = null;
           String tempFString = null;
-          if (isAlphafoldModel()
-                  || this.getTemperatureFactorType() == AlignmentAnnotation.TFType.PLDDT)
+          if (isAlphafoldModel() || this
+                  .getTemperatureFactorType() == StructureImportSettings.TFType.PLDDT)
           {
             builder = new AlphaFoldAnnotationRowBuilder();
           }
@@ -321,6 +321,11 @@ public class JmolParser extends StructureFile implements JmolStatusListener
     }
   }
 
+  public void setAlphafoldModel(boolean afm)
+  {
+    alphaFoldModel = afm;
+  }
+
   private boolean isAlphafoldModel()
   {
     return alphaFoldModel;