Merge remote-tracking branch 'origin/releases/Release_2_10_2b1_Branch'

[jalview.git] / src / jalview / fts / service / pdb / PDBFTSRestClient.java

diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
index 06bf55b..a483f44 100644 (file)
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -82,9 +82,10 @@ public class PDBFTSRestClient extends FTSRestClient
       ClientConfig clientConfig = new DefaultClientConfig();
       Client client = Client.create(clientConfig);
 
-      String wantedFields = getDataColumnsFieldsAsCommaDelimitedString(pdbRestRequest
-              .getWantedFields());
-      int responseSize = (pdbRestRequest.getResponseSize() == 0) ? getDefaultResponsePageSize()
+      String wantedFields = getDataColumnsFieldsAsCommaDelimitedString(
+              pdbRestRequest.getWantedFields());
+      int responseSize = (pdbRestRequest.getResponseSize() == 0)
+              ? getDefaultResponsePageSize()
               : pdbRestRequest.getResponseSize();
       int offSet = pdbRestRequest.getOffSet();
       String sortParam = null;
@@ -108,11 +109,11 @@ public class PDBFTSRestClient extends FTSRestClient
         }
       }
 
-      String facetPivot = (pdbRestRequest.getFacetPivot() == null || pdbRestRequest
-              .getFacetPivot().isEmpty()) ? "" : pdbRestRequest
-              .getFacetPivot();
-      String facetPivotMinCount = String.valueOf(pdbRestRequest
-              .getFacetPivotMinCount());
+      String facetPivot = (pdbRestRequest.getFacetPivot() == null
+              || pdbRestRequest.getFacetPivot().isEmpty()) ? ""
+                      : pdbRestRequest.getFacetPivot();
+      String facetPivotMinCount = String
+              .valueOf(pdbRestRequest.getFacetPivotMinCount());
 
       String query = pdbRestRequest.getFieldToSearchBy()
               + pdbRestRequest.getSearchTerm()
@@ -143,8 +144,8 @@ public class PDBFTSRestClient extends FTSRestClient
                 .queryParam("q", query).queryParam("sort", sortParam);
       }
       // Execute the REST request
-      ClientResponse clientResponse = webResource.accept(
-              MediaType.APPLICATION_JSON).get(ClientResponse.class);
+      ClientResponse clientResponse = webResource
+              .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
 
       // Get the JSON string from the response object
       String responseString = clientResponse.getEntity(String.class);
@@ -180,9 +181,8 @@ public class PDBFTSRestClient extends FTSRestClient
       if (exceptionMsg.contains("SocketException"))
       {
         // No internet connection
-        throw new Exception(
-                MessageManager
-                        .getString("exception.unable_to_detect_internet_connection"));
+        throw new Exception(MessageManager.getString(
+                "exception.unable_to_detect_internet_connection"));
       }
       else if (exceptionMsg.contains("UnknownHostException"))
       {
@@ -260,8 +260,8 @@ public class PDBFTSRestClient extends FTSRestClient
               .parse(pdbJsonResponseString);
 
       JSONObject pdbResponse = (JSONObject) jsonObj.get("response");
-      String queryTime = ((JSONObject) jsonObj.get("responseHeader")).get(
-              "QTime").toString();
+      String queryTime = ((JSONObject) jsonObj.get("responseHeader"))
+              .get("QTime").toString();
       int numFound = Integer
               .valueOf(pdbResponse.get("numFound").toString());
       if (numFound > 0)
@@ -298,8 +298,9 @@ public class PDBFTSRestClient extends FTSRestClient
     Collection<FTSDataColumnI> diplayFields = request.getWantedFields();
     SequenceI associatedSeq = request.getAssociatedSequence();
     int colCounter = 0;
-    summaryRowData = new Object[(associatedSeq != null) ? diplayFields
-            .size() + 1 : diplayFields.size()];
+    summaryRowData = new Object[(associatedSeq != null)
+            ? diplayFields.size() + 1
+            : diplayFields.size()];
     if (associatedSeq != null)
     {
       associatedSequence = associatedSeq;
@@ -325,10 +326,12 @@ public class PDBFTSRestClient extends FTSRestClient
         try
         {
           summaryRowData[colCounter++] = (field.getDataType()
-                  .getDataTypeClass() == Integer.class) ? Integer
-                  .valueOf(fieldData) : (field.getDataType()
-                  .getDataTypeClass() == Double.class) ? Double
-                  .valueOf(fieldData) : sanitiseData(fieldData);
+                  .getDataTypeClass() == Integer.class)
+                          ? Integer.valueOf(fieldData)
+                          : (field.getDataType()
+                                  .getDataTypeClass() == Double.class)
+                                          ? Double.valueOf(fieldData)
+                                          : sanitiseData(fieldData);
         } catch (Exception e)
         {
           e.printStackTrace();
@@ -418,8 +421,8 @@ public class PDBFTSRestClient extends FTSRestClient
             || allDefaultDisplayedStructureDataColumns.isEmpty())
     {
       allDefaultDisplayedStructureDataColumns = new ArrayList<FTSDataColumnI>();
-      allDefaultDisplayedStructureDataColumns.addAll(super
-              .getAllDefaultDisplayedFTSDataColumns());
+      allDefaultDisplayedStructureDataColumns
+              .addAll(super.getAllDefaultDisplayedFTSDataColumns());
     }
     return allDefaultDisplayedStructureDataColumns;
   }