From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 21 Jul 2016 16:20:56 +0000 (+0100)
Subject: Resolve merge conflict for StructureImportSettings
X-Git-Tag: Release_2_10_0~135
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=65c671b0263c0c692a4a0a0905a4acc2fc6b1065;p=jalview.git

Resolve merge conflict for StructureImportSettings
---

65c671b0263c0c692a4a0a0905a4acc2fc6b1065
diff --cc src/jalview/structure/StructureImportSettings.java
index c49b141,388ccbd..e969d4b
--- a/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;
    }