JAL-4036 add search fieldname to dropdown list

[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 b1cfc53..2d79432 100644 (file)
--- a/src/jalview/fts/core/FTSRestClient.java
+++ b/src/jalview/fts/core/FTSRestClient.java
@@ -27,13 +27,13 @@ import java.io.InputStreamReader;
 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 jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
-import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
 import jalview.fts.api.FTSRestClientI;
+import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
 
 /**
  * Base class providing implementation for common methods defined in
@@ -59,7 +59,7 @@ public abstract class FTSRestClient implements FTSRestClientI
 
   private int defaultResponsePageSize = 100;
 
-  protected HashMap<String,String> mockQueries = null;
+  protected HashMap<String, String> mockQueries = null;
 
   protected FTSRestClient()
   {
@@ -72,7 +72,7 @@ public abstract class FTSRestClient implements FTSRestClientI
 
     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)
@@ -144,7 +144,8 @@ public abstract class FTSRestClient implements FTSRestClientI
               @Override
               public String toString()
               {
-                return lineData[0];
+                return "ALL".equals(getName()) ? getName()
+                        : getName() + " [" + getAltCode() + "]";
               }
 
               @Override
@@ -171,7 +172,8 @@ public abstract class FTSRestClient implements FTSRestClientI
               public DataTypeI getDataType()
               {
                 final String[] dataTypeString = lineData[2].split("\\|");
-                final String classString = dataTypeString[0].toUpperCase();
+                final String classString = dataTypeString[0]
+                        .toUpperCase(Locale.ROOT);
 
                 return new DataTypeI()
                 {
@@ -182,7 +184,7 @@ public abstract class FTSRestClient implements FTSRestClientI
                     if (dataTypeString.length > 1
                             && dataTypeString[1] != null)
                     {
-                      switch (dataTypeString[1].toUpperCase())
+                      switch (dataTypeString[1].toUpperCase(Locale.ROOT))
                       {
                       case "T":
                       case "TRUE":
@@ -290,8 +292,8 @@ public abstract class FTSRestClient implements FTSRestClientI
                 FTSDataColumnI that = (FTSDataColumnI) otherObject;
                 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());
               }
 
             };
@@ -435,9 +437,11 @@ public abstract class FTSRestClient implements FTSRestClientI
   /**
    * 
    * @param instance
-   * @param mocks {{working query, working response}, ...}
+   * @param mocks
+   *          {{working query, working response}, ...}
    */
-  public static void createMockFTSRestClient(FTSRestClient instance,String[][] mocks)
+  public static void createMockFTSRestClient(FTSRestClient instance,
+          String[][] mocks)
   {
     instance.setMock(mocks);
   }
@@ -497,7 +501,7 @@ public abstract class FTSRestClient implements FTSRestClientI
 
   public static void unMock(FTSRestClient instance)
   {
-    instance.mockQueries=null;
+    instance.mockQueries = null;
   }
 
   protected String getResourceFile(String fileName)
@@ -526,20 +530,21 @@ public abstract class FTSRestClient implements FTSRestClientI
 
   protected void setMock(String[][] mocks)
   {
-    if (mocks==null) {
-      mockQueries=null;
+    if (mocks == null)
+    {
+      mockQueries = null;
       return;
     }
-    mockQueries=new HashMap<String,String>();
-    for (String[] mock:mocks)
+    mockQueries = new HashMap<String, String>();
+    for (String[] mock : mocks)
     {
-      mockQueries.put(mock[0],mock[1]);
+      mockQueries.put(mock[0], mock[1]);
     }
   }
 
   protected boolean isMocked()
   {
-    return mockQueries!=null;
+    return mockQueries != null;
   }
 
   @Override
@@ -552,7 +557,8 @@ public abstract class FTSRestClient implements FTSRestClientI
       columnNames = new String[] { "", "Display", "Group" };
       break;
     default:
-      // non structure sources don't return any other kind of preferences columns
+      // non structure sources don't return any other kind of preferences
+      // columns
       break;
     }
     return columnNames;