Merge branch 'releases/Release_2_10_Branch' into develop

[jalview.git] / src / jalview / gui / StructureChooser.java

diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java
index af8b2f3..57debe3 100644 (file)
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@ -195,7 +195,7 @@ public class StructureChooser extends GStructureChooser implements
     {
       getResultTable().setModel(
               FTSRestResponse.getTableModel(lastPdbRequest,
-              discoveredStructuresSet));
+                      discoveredStructuresSet));
       noOfStructuresFound = discoveredStructuresSet.size();
       mainFrame.setTitle(MessageManager.formatMessage(
               "label.structure_chooser_no_of_structures",
@@ -264,8 +264,7 @@ public class StructureChooser extends GStructureChooser implements
         if (isValidSeqName(entry.getId()))
         {
           queryBuilder.append("pdb_id:")
-                  .append(entry.getId().toLowerCase())
-                  .append(" OR ");
+                  .append(entry.getId().toLowerCase()).append(" OR ");
           isPDBRefsFound = true;
           // seqRefs.add(entry.getId());
         }
@@ -281,8 +280,7 @@ public class StructureChooser extends GStructureChooser implements
           if (dbRef.getSource().equalsIgnoreCase(DBRefSource.UNIPROT))
           {
             queryBuilder.append("uniprot_accession:")
-                    .append(getDBRefId(dbRef))
-                    .append(" OR ");
+                    .append(getDBRefId(dbRef)).append(" OR ");
             queryBuilder.append("uniprot_id:").append(getDBRefId(dbRef))
                     .append(" OR ");
             isUniProtRefsFound = true;
@@ -291,8 +289,7 @@ public class StructureChooser extends GStructureChooser implements
           {
 
             queryBuilder.append("pdb_id:")
-                    .append(getDBRefId(dbRef).toLowerCase())
-                    .append(" OR ");
+                    .append(getDBRefId(dbRef).toLowerCase()).append(" OR ");
             isPDBRefsFound = true;
           }
           else
@@ -347,7 +344,6 @@ public class StructureChooser extends GStructureChooser implements
             .replaceAll("[^\\dA-Za-z|_]", "").replaceAll("\\s+", "+");
   }
 
-
   /**
    * Ensures sequence ref names are not less than 3 characters and does not
    * contain a database name
@@ -458,8 +454,8 @@ public class StructureChooser extends GStructureChooser implements
           reorderedStructuresSet.addAll(filteredResponse);
           reorderedStructuresSet.addAll(discoveredStructuresSet);
           getResultTable().setModel(
-                  FTSRestResponse.getTableModel(
-                  lastPdbRequest, reorderedStructuresSet));
+                  FTSRestResponse.getTableModel(lastPdbRequest,
+                          reorderedStructuresSet));
 
           FTSRestResponse.configureTableColumn(getResultTable(),
                   wantedFields, tempUserPrefs);
@@ -898,9 +894,9 @@ public class StructureChooser extends GStructureChooser implements
         }
         if (seq.getPrimaryDBRefs().size() == 0)
         {
-            seqsWithoutSourceDBRef.add(seq);
-            continue;
-          }
+          seqsWithoutSourceDBRef.add(seq);
+          continue;
+        }
       }
       if (!seqsWithoutSourceDBRef.isEmpty())
       {
@@ -1003,8 +999,7 @@ public class StructureChooser extends GStructureChooser implements
           pdbRequest.setResponseSize(1);
           pdbRequest.setFieldToSearchBy("(pdb_id:");
           pdbRequest.setWantedFields(wantedFields);
-          pdbRequest
-.setSearchTerm(searchTerm + ")");
+          pdbRequest.setSearchTerm(searchTerm + ")");
           pdbRequest.setAssociatedSequence(selectedSequence);
           pdbRestCleint = PDBFTSRestClient.getInstance();
           wantedFields.add(pdbRestCleint.getPrimaryKeyColumn());