X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Ffts%2Fcore%2FFTSRestClient.java;h=4899e3809fab5b331b4540f25c0c73dc2d480109;hb=7c9fbca0e2d9be5fd05e1c89f24f81d558bf6849;hp=f2df461997cf2f68451063ec2547a3f29a541b1c;hpb=b577ea70f354225426c5a5ecb8def7261e1cd3aa;p=jalview.git
diff --git a/src/jalview/fts/core/FTSRestClient.java b/src/jalview/fts/core/FTSRestClient.java
index f2df461..4899e38 100644
--- a/src/jalview/fts/core/FTSRestClient.java
+++ b/src/jalview/fts/core/FTSRestClient.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.fts.core;
import jalview.fts.api.FTSDataColumnI;
@@ -45,9 +65,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 +279,6 @@ public abstract class FTSRestClient implements FTSRestClientI
this.getGroup());
}
-
@Override
public boolean equals(Object otherObject)
{
@@ -269,7 +288,6 @@ public abstract class FTSRestClient implements FTSRestClientI
&& this.getGroup().equals(that.getGroup());
}
-
};
dataColumns.add(dataCol);
@@ -345,7 +363,6 @@ public abstract class FTSRestClient implements FTSRestClientI
return result;
}
-
@Override
public Collection getAllFTSDataColumns()
{
@@ -367,7 +384,7 @@ public abstract class FTSRestClient implements FTSRestClientI
}
@Override
- public Collection getAllDefaulDisplayedDataColumns()
+ public Collection getAllDefaultDisplayedFTSDataColumns()
{
if (defaulDisplayedDataColumns == null
|| defaulDisplayedDataColumns.isEmpty())
@@ -432,10 +449,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);
@@ -451,7 +467,8 @@ public abstract class FTSRestClient implements FTSRestClientI
case 502:
case 504:
case 505:
- message = MessageManager.getString("exception.fts_server_error");
+ message = MessageManager.formatMessage("exception.fts_server_error",
+ service);
break;
case 503:
message = MessageManager.getString("exception.service_not_available");