X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Fpdb%2FPDBFTSRestClient.java;fp=src%2Fjalview%2Ffts%2Fservice%2Fpdb%2FPDBFTSRestClient.java;h=06bf55b39c677a691955a0ed8c9e1531c25ac4fd;hb=f660919d1e11e2d1ea382909b01e727a675dbce6;hp=219d6d6dd2de31176cc600c33910c9649a26bdbc;hpb=a9a8a71c1682f639552e9954e565042847513195;p=jalview.git diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java index 219d6d6..06bf55b 100644 --- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java +++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java @@ -140,8 +140,7 @@ public class PDBFTSRestClient extends FTSRestClient .queryParam("wt", "json").queryParam("fl", wantedFields) .queryParam("rows", String.valueOf(responseSize)) .queryParam("start", String.valueOf(offSet)) - .queryParam("q", query) - .queryParam("sort", sortParam); + .queryParam("q", query).queryParam("sort", sortParam); } // Execute the REST request ClientResponse clientResponse = webResource.accept( @@ -162,8 +161,8 @@ public class PDBFTSRestClient extends FTSRestClient } else { - errorMessage = getMessageByHTTPStatusCode(clientResponse -.getStatus(), "PDB"); + errorMessage = getMessageByHTTPStatusCode( + clientResponse.getStatus(), "PDB"); throw new Exception(errorMessage); } } @@ -198,7 +197,6 @@ public class PDBFTSRestClient extends FTSRestClient } } - /** * Process error response from PDB server if/when one occurs. * @@ -328,15 +326,13 @@ public class PDBFTSRestClient extends FTSRestClient { summaryRowData[colCounter++] = (field.getDataType() .getDataTypeClass() == Integer.class) ? Integer - .valueOf(fieldData) - : (field.getDataType() + .valueOf(fieldData) : (field.getDataType() .getDataTypeClass() == Double.class) ? Double - .valueOf(fieldData) - : sanitiseData(fieldData); + .valueOf(fieldData) : sanitiseData(fieldData); } catch (Exception e) { e.printStackTrace(); - System.out.println("offending value:" + fieldData); + System.out.println("offending value:" + fieldData); } } } @@ -405,7 +401,6 @@ public class PDBFTSRestClient extends FTSRestClient return "/fts/pdb_data_columns.txt"; } - public static FTSRestClientI getInstance() { if (instance == null)