X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestClient.java;h=1f91fbae5a36bdebe692013b8e9e169d7c4051a4;hb=853624fb32058cccc544ae7d13af6ad4b0800b6c;hp=230cbdb407e930fa20f959968123f4e0c61b4e48;hpb=02d6aa2077a261d41db77a0158f2b4b779a36398;p=jalview.git diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java index 230cbdb..1f91fba 100644 --- a/src/jalview/fts/core/FTSRestClient.java +++ b/src/jalview/fts/core/FTSRestClient.java @@ -45,9 +45,9 @@ public abstract class FTSRestClient implements FTSRestClientI public void parseDataColumnsConfigFile() { String fileName = getColumnDataConfigFileName(); - - InputStream in = getClass().getResourceAsStream(fileName); - + + InputStream in = getClass().getResourceAsStream(fileName); + try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) { String line; @@ -259,7 +259,6 @@ public abstract class FTSRestClient implements FTSRestClientI this.getGroup()); } - @Override public boolean equals(Object otherObject) { @@ -269,7 +268,6 @@ public abstract class FTSRestClient implements FTSRestClientI && this.getGroup().equals(that.getGroup()); } - }; dataColumns.add(dataCol); @@ -345,7 +343,6 @@ public abstract class FTSRestClient implements FTSRestClientI return result; } - @Override public Collection getAllFTSDataColumns() { @@ -432,10 +429,9 @@ public abstract class FTSRestClient implements FTSRestClientI switch (code) { case 400: - message = MessageManager - .getString("exception.bad_request"); + message = MessageManager.getString("exception.bad_request"); break; - + case 410: message = MessageManager.formatMessage( "exception.fts_rest_service_no_longer_available", service);