JAL-2071 House keeping

diff --git a/.classpath b/.classpath
index 37b682b..cad9e2b 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -39,7 +39,7 @@
        <classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
        <classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
        <classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
-       <classpathentry kind="lib" path="lib/groovy-all-2.4.6.jar"/>
+       <classpathentry kind="lib" path="lib/groovy-all-1.8.2.jar"/>
        <classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
        <classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
        <classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>

diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java
index 8ac740c..f611d5b 100644 (file)
--- a/src/jalview/fts/core/FTSRestClient.java
+++ b/src/jalview/fts/core/FTSRestClient.java
@@ -399,11 +399,10 @@ public abstract class FTSRestClient implements FTSRestClientI
 
   protected String getResourceFile(String fileName)
   {
-    ClassLoader classLoader = getClass().getClassLoader();
     String result = "";
     try
     {
-      result = classLoader.getResource(fileName).getFile();
+      result = getClass().getResource(fileName).getFile();
     } catch (Exception e)
     {
       e.printStackTrace();

diff --git a/test/jalview/fts/core/FTSRestClientTest.java b/test/jalview/fts/core/FTSRestClientTest.java
index fa36cac..4a90c4e 100644 (file)
--- a/test/jalview/fts/core/FTSRestClientTest.java
+++ b/test/jalview/fts/core/FTSRestClientTest.java
@@ -268,7 +268,7 @@ public class FTSRestClientTest
               "unavailable group").toString();
     } catch (Exception e)
     {
-      e.printStackTrace();
+      Assert.assertTrue(true);
     }
 
     String actualResourseFile = ftsRestClient
@@ -285,7 +285,6 @@ public class FTSRestClientTest
       ftsRestClient.getDataColumnByNameOrCode("unavailable column");
     } catch (Exception e)
     {
-      e.printStackTrace();
       System.out.println(e.getMessage());
       String expectedMessage = "Couldn't find data column with name : unavailable column";
       Assert.assertEquals(e.getMessage(), expectedMessage);
@@ -295,7 +294,6 @@ public class FTSRestClientTest
       ftsRestClient.getDataColumnGroupById("unavailable column group Id");
     } catch (Exception e)
     {
-      e.printStackTrace();
       System.out.println(e.getMessage());
       String expectedMessage = "Couldn't find data column group with id : unavailable column group Id";
       Assert.assertEquals(e.getMessage(), expectedMessage);