X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FStructureFile.java;h=ab220f0ade10e31ae6b683fa89ab484a17b2e763;hb=4a3198610bf947684199326eeb41fefa0a74d9e4;hp=d39ab387b90a466a297d9dce3120f46b957d467a;hpb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;p=jalview.git

diff --git a/src/jalview/io/StructureFile.java b/src/jalview/io/StructureFile.java
index d39ab38..ab220f0 100644
--- a/src/jalview/io/StructureFile.java
+++ b/src/jalview/io/StructureFile.java
@@ -42,14 +42,8 @@ import MCview.PDBChain;
 
 public abstract class StructureFile extends AlignFile
 {
-
   private String id;
 
-  public enum StructureFileType
-  {
-    PDB, MMCIF, MMTF
-  };
-
   private PDBEntry.Type dbRefType;
 
   /**
@@ -412,7 +406,8 @@ public abstract class StructureFile extends AlignFile
    * make a friendly ID string.
    * 
    * @param dataName
-   * @return truncated dataName to after last '/'
+   * @return truncated dataName to after last '/' and pruned .extension if
+   *         present
    */
   protected String safeName(String dataName)
   {
@@ -421,6 +416,9 @@ public abstract class StructureFile extends AlignFile
     {
       dataName = dataName.substring(p + 1);
     }
+    if(dataName.indexOf(".") > -1){
+      dataName = dataName.substring(0, dataName.lastIndexOf("."));
+    }
     return dataName;
   }
 
@@ -488,20 +486,4 @@ public abstract class StructureFile extends AlignFile
   {
     this.pdbIdAvailable = pdbIdAvailable;
   }
-
-  public static boolean isStructureFile(String fileType)
-  {
-    if (fileType == null)
-    {
-      return false;
-    }
-    for (StructureFileType sfType : StructureFileType.values())
-    {
-      if (sfType.name().equalsIgnoreCase(fileType))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
 }