Merge branch 'develop' into features/JAL-2094_colourInterface

[jalview.git] / src / jalview / ws / dbsources / Pdb.java

diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java
index fc636c6..04c23a2 100644 (file)
--- a/src/jalview/ws/dbsources/Pdb.java
+++ b/src/jalview/ws/dbsources/Pdb.java
@@ -134,7 +134,7 @@ public class Pdb extends EbiFileRetrievedProxy
       return null;
     }
     String ext = StructureImportSettings.getDefaultStructureFileFormat()
-            .equals(Type.MMCIF) ? ".cif" : ".xml";
+            .equalsIgnoreCase(Type.MMCIF.toString()) ? ".cif" : ".xml";
     EBIFetchClient ebi = new EBIFetchClient();
     file = ebi.fetchDataAsFile("pdb:" + id,
             StructureImportSettings.getDefaultStructureFileFormat().toLowerCase(),
@@ -173,6 +173,8 @@ public class Pdb extends EbiFileRetrievedProxy
                           || chid.trim().equals(chain.trim()) || (chain
                           .trim().length() == 0 && chid.equals("_")))))
           {
+            // FIXME seems to result in 'PDB|1QIP|1qip|A' - 1QIP is redundant.
+            // TODO: suggest simplify naming to 1qip|A as default name defined
             pdbcs.setName(jalview.datamodel.DBRefSource.PDB + "|" + id
                     + "|" + pdbcs.getName());
             // Might need to add more metadata to the PDBEntry object