From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 Apr 2016 11:17:41 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~249^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2facc9ee2fdb025b5cc79b005e7eb5bd915cd9ba;hp=659cdd6d20a562ff4a856f2325399f2dbb398126;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/resources/fts/pdb_data_columns.conf b/resources/fts/pdb_data_columns.txt
similarity index 100%
rename from resources/fts/pdb_data_columns.conf
rename to resources/fts/pdb_data_columns.txt
diff --git a/resources/fts/uniprot_data_columns.conf b/resources/fts/uniprot_data_columns.txt
similarity index 100%
rename from resources/fts/uniprot_data_columns.conf
rename to resources/fts/uniprot_data_columns.txt
diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
index 8e63463..28e06d2 100644
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -413,7 +413,7 @@ public class PDBFTSRestClient extends FTSRestClient
   @Override
   public String getColumnDataConfigFileName()
   {
-    return getResourceFile("/fts/pdb_data_columns.conf");
+    return getResourceFile("/fts/pdb_data_columns.txt");
   }
 
 
diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index f920166..15c699e 100644
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -217,7 +217,7 @@ public class UniProtFTSRestClient extends FTSRestClient
   @Override
   public String getColumnDataConfigFileName()
   {
-    return getResourceFile("/fts/uniprot_data_columns.conf");
+    return getResourceFile("/fts/uniprot_data_columns.txt");
   }
 
 }