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-2189 source formatting
[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
230cbdb
..
1f91fba
100644
(file)
--- 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();
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;
try (BufferedReader br = new BufferedReader(new InputStreamReader(in)))
{
String line;
@@
-259,7
+259,6
@@
public abstract class FTSRestClient implements FTSRestClientI
this.getGroup());
}
this.getGroup());
}
-
@Override
public boolean equals(Object otherObject)
{
@Override
public boolean equals(Object otherObject)
{
@@
-269,7
+268,6
@@
public abstract class FTSRestClient implements FTSRestClientI
&& this.getGroup().equals(that.getGroup());
}
&& this.getGroup().equals(that.getGroup());
}
-
};
dataColumns.add(dataCol);
};
dataColumns.add(dataCol);
@@
-345,7
+343,6
@@
public abstract class FTSRestClient implements FTSRestClientI
return result;
}
return result;
}
-
@Override
public Collection<FTSDataColumnI> getAllFTSDataColumns()
{
@Override
public Collection<FTSDataColumnI> getAllFTSDataColumns()
{
@@
-432,10
+429,9
@@
public abstract class FTSRestClient implements FTSRestClientI
switch (code)
{
case 400:
switch (code)
{
case 400:
- message = MessageManager
- .getString("exception.bad_request");
+ message = MessageManager.getString("exception.bad_request");
break;
break;
-
+
case 410:
message = MessageManager.formatMessage(
"exception.fts_rest_service_no_longer_available", service);
case 410:
message = MessageManager.formatMessage(
"exception.fts_rest_service_no_longer_available", service);