JAL-3855 JAL-3829 better checks on PDB or mmCIF file based on URL path (though should...

[jalview.git] / src / jalview / gui / structurechooser / ThreeDBStructureChooserQuerySource.java

diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index 78dca3f..ff414dd 100644 (file)
--- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@ -8,6 +8,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.swing.JTable;
@@ -384,7 +385,9 @@ public class ThreeDBStructureChooserQuerySource
       {
         pdbEntry = new PDBEntry();
         pdbEntry.setId(pdbIdStr);
-        pdbEntry.setType(PDBEntry.Type.MMCIF);
+        boolean hasCif = urlStr.toLowerCase(Locale.ENGLISH).endsWith("cif");
+        boolean probablyPdb = urlStr.toLowerCase(Locale.ENGLISH).contains("pdb");
+        pdbEntry.setType(hasCif ? PDBEntry.Type.MMCIF : probablyPdb ? PDBEntry.Type.PDB : PDBEntry.Type.FILE);
         if (!"PDBe".equalsIgnoreCase(typeColumn))
         {
           pdbEntry.setRetrievalUrl(urlStr);