git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
231db84
)
JAL-4036 add search fieldname to dropdown list
author
Ben Soares
<b.soares@dundee.ac.uk>
Thu, 21 Jul 2022 20:00:15 +0000
(21:00 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Thu, 21 Jul 2022 20:00:15 +0000
(21:00 +0100)
src/jalview/fts/core/FTSRestClient.java
patch
|
blob
|
history
diff --git
a/src/jalview/fts/core/FTSRestClient.java
b/src/jalview/fts/core/FTSRestClient.java
index
ac5b280
..
2d79432
100644
(file)
--- a/
src/jalview/fts/core/FTSRestClient.java
+++ b/
src/jalview/fts/core/FTSRestClient.java
@@
-20,8
+20,6
@@
*/
package jalview.fts.core;
*/
package jalview.fts.core;
-import java.util.Locale;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@
-29,13
+27,13
@@
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Objects;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
import java.util.Objects;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSDataColumnI.FTSDataColumnGroupI;
-import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
-import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
import jalview.fts.api.FTSRestClientI;
import jalview.fts.api.FTSRestClientI;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
/**
* Base class providing implementation for common methods defined in
/**
* Base class providing implementation for common methods defined in
@@
-146,7
+144,8
@@
public abstract class FTSRestClient implements FTSRestClientI
@Override
public String toString()
{
@Override
public String toString()
{
- return lineData[0];
+ return "ALL".equals(getName()) ? getName()
+ : getName() + " [" + getAltCode() + "]";
}
@Override
}
@Override