git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3311 JAL-3141 JAL-3144 tidying obsolete message bundle entries
[jalview.git]
/
src
/
jalview
/
fts
/
core
/
FTSRestClient.java
diff --git
a/src/jalview/fts/core/FTSRestClient.java
b/src/jalview/fts/core/FTSRestClient.java
index
076e212
..
7a8a695
100644
(file)
--- a/
src/jalview/fts/core/FTSRestClient.java
+++ b/
src/jalview/fts/core/FTSRestClient.java
@@
-20,11
+20,6
@@
*/
package jalview.fts.core;
*/
package jalview.fts.core;
-import jalview.fts.api.FTSDataColumnI;
-import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
-import jalview.fts.api.FTSRestClientI;
-import jalview.util.MessageManager;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@
-33,6
+28,10
@@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Objects;
import java.util.Collection;
import java.util.Objects;
+import jalview.fts.api.FTSDataColumnI;
+import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
+import jalview.fts.api.FTSRestClientI;
+
/**
* Base class providing implementation for common methods defined in
* FTSRestClientI
/**
* Base class providing implementation for common methods defined in
* FTSRestClientI
@@
-43,13
+42,13
@@
import java.util.Objects;
*/
public abstract class FTSRestClient implements FTSRestClientI
{
*/
public abstract class FTSRestClient implements FTSRestClientI
{
- protected Collection<FTSDataColumnI> dataColumns = new ArrayList<FTSDataColumnI>();
+ protected Collection<FTSDataColumnI> dataColumns = new ArrayList<>();
- protected Collection<FTSDataColumnGroupI> dataColumnGroups = new ArrayList<FTSDataColumnGroupI>();
+ protected Collection<FTSDataColumnGroupI> dataColumnGroups = new ArrayList<>();
- protected Collection<FTSDataColumnI> searchableDataColumns = new ArrayList<FTSDataColumnI>();
+ protected Collection<FTSDataColumnI> searchableDataColumns = new ArrayList<>();
- protected Collection<FTSDataColumnI> defaulDisplayedDataColumns = new ArrayList<FTSDataColumnI>();
+ protected Collection<FTSDataColumnI> defaulDisplayedDataColumns = new ArrayList<>();
protected FTSDataColumnI primaryKeyColumn;
protected FTSDataColumnI primaryKeyColumn;
@@
-68,7
+67,7
@@
public abstract class FTSRestClient implements FTSRestClientI
InputStream in = getClass().getResourceAsStream(fileName);
InputStream in = getClass().getResourceAsStream(fileName);
- try (BufferedReader br = new BufferedReader(new InputStreamReader(in)))
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(in)))
{
String line;
while ((line = br.readLine()) != null)
{
String line;
while ((line = br.readLine()) != null)
@@
-284,7
+283,8
@@
public abstract class FTSRestClient implements FTSRestClientI
public boolean equals(Object otherObject)
{
FTSDataColumnI that = (FTSDataColumnI) otherObject;
public boolean equals(Object otherObject)
{
FTSDataColumnI that = (FTSDataColumnI) otherObject;
- return this.getCode().equals(that.getCode())
+ return otherObject == null ? false
+ : this.getCode().equals(that.getCode())
&& this.getName().equals(that.getName())
&& this.getGroup().equals(that.getGroup());
}
&& this.getName().equals(that.getName())
&& this.getGroup().equals(that.getGroup());
}
@@
-445,22
+445,21
@@
public abstract class FTSRestClient implements FTSRestClientI
throw new Exception("Couldn't find data column group with id : " + id);
}
throw new Exception("Couldn't find data column group with id : " + id);
}
- public String getMessageByHTTPStatusCode(int code, String service)
+ public static String getMessageByHTTPStatusCode(int code, String service)
{
String message = "";
switch (code)
{
case 400:
{
String message = "";
switch (code)
{
case 400:
- message = MessageManager.getString("exception.bad_request");
+ message = "Bad request. There is a problem with your input.";
break;
case 410:
break;
case 410:
- message = MessageManager.formatMessage(
- "exception.fts_rest_service_no_longer_available", service);
+ message = service + " rest services no longer available!";
break;
case 403:
case 404:
break;
case 403:
case 404:
- message = MessageManager.getString("exception.resource_not_be_found");
+ message = "The requested resource could not be found";
break;
case 408:
case 409:
break;
case 408:
case 409:
@@
-469,16
+468,16
@@
public abstract class FTSRestClient implements FTSRestClientI
case 502:
case 504:
case 505:
case 502:
case 504:
case 505:
- message = MessageManager.formatMessage("exception.fts_server_error",
- service);
+ message = "There seems to be an error from the " + service
+ + " server";
break;
case 503:
break;
case 503:
- message = MessageManager.getString("exception.service_not_available");
+ message = "Service not available. The server is being updated, try again later.";
break;
default:
break;
}
break;
default:
break;
}
- return message;
+ return String.valueOf(code) + " " + message;
}
protected String getResourceFile(String fileName)
}
protected String getResourceFile(String fileName)