Resolve merge conflict for StructureImportSettings

diff --cc src/jalview/bin/Cache.java
Simple merge

diff --cc src/jalview/ext/jmol/JmolParser.java
Simple merge

diff --cc src/jalview/structure/StructureImportSettings.java
index c49b141,388ccbd..e969d4b
--- 1/src/jalview/structure/StructureImportSettings.java
--- 2/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@@ -24,13 -31,13 +31,11 @@@ public class StructureImportSetting
  
    private static boolean showSeqFeatures = true;
  
-   public static final String JMOL_PARSER = "JMolParser";
- 
-   public static final String JALVIEW_PARSER = "JalViewParser";
- 
-   public static final String MMCIF = "mmCIF";
 -  private static boolean processHETATMs = false;
 -
+   public enum StructureParser
+   {
+     JMOL_PARSER, JALVIEW_PARSER
+   }
  
-   public static final String PDB = "PDB";
  
    /**
     * Determines the default file format for structure files to be downloaded
@@@ -103,15 -110,27 +108,17 @@@
    public static void setDefaultStructureFileFormat(
            String defaultStructureFileFormat)
    {
-     StructureImportSettings.defaultStructureFileFormat = defaultStructureFileFormat;
+     StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
+             .valueOf(defaultStructureFileFormat);
    }
  
 -  public static boolean isProcessHETATMs()
 -  {
 -    return processHETATMs;
 -  }
 -
 -  public static void setProcessHETATMs(boolean processHETATMs)
 -  {
 -    StructureImportSettings.processHETATMs = processHETATMs;
 -  }
 -
    public static String getDefaultPDBFileParser()
    {
-     return defaultPDBFileParser;
+     return defaultPDBFileParser.toString();
    }
  
-   public static void setDefaultPDBFileParser(String defaultPDBFileParser)
+   public static void setDefaultPDBFileParser(
+           StructureParser defaultPDBFileParser)
    {
      StructureImportSettings.defaultPDBFileParser = defaultPDBFileParser;
    }

diff --cc test/jalview/ext/jmol/JmolParserTest.java
Simple merge