git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3691 automatic insertion of Locale.ROOT to toUpperCase() and toLowerCase() and...
[jalview.git]
/
src
/
jalview
/
gui
/
structurechooser
/
PDBStructureChooserQuerySource.java
diff --git
a/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
b/src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
index
1c43bea
..
727d8e0
100644
(file)
--- a/
src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
+++ b/
src/jalview/gui/structurechooser/PDBStructureChooserQuerySource.java
@@
-1,5
+1,7
@@
package jalview.gui.structurechooser;
package jalview.gui.structurechooser;
+import java.util.Locale;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@
-78,7
+80,7
@@
public class PDBStructureChooserQuerySource
{
if (isValidSeqName(entry.getId()))
{
{
if (isValidSeqName(entry.getId()))
{
- String id = entry.getId().toLowerCase();
+ String id = entry.getId().toLowerCase(Locale.ROOT);
queryBuilder.append("pdb_id:").append(id).append(" OR ");
isPDBRefsFound = true;
pdbids.add(id);
queryBuilder.append("pdb_id:").append(id).append(" OR ");
isPDBRefsFound = true;
pdbids.add(id);
@@
-106,7
+108,7
@@
public class PDBStructureChooserQuerySource
else if (dbRef.getSource().equalsIgnoreCase(DBRefSource.PDB))
{
else if (dbRef.getSource().equalsIgnoreCase(DBRefSource.PDB))
{
- String id = getDBRefId(dbRef).toLowerCase();
+ String id = getDBRefId(dbRef).toLowerCase(Locale.ROOT);
if (!pdbids.contains(id))
{
queryBuilder.append("pdb_id:").append(id).append(" OR ");
if (!pdbids.contains(id))
{
queryBuilder.append("pdb_id:").append(id).append(" OR ");
@@
-126,7
+128,7
@@
public class PDBStructureChooserQuerySource
{
String seqName = seq.getName();
seqName = sanitizeSeqName(seqName);
{
String seqName = seq.getName();
seqName = sanitizeSeqName(seqName);
- String[] names = seqName.toLowerCase().split("\\|");
+ String[] names = seqName.toLowerCase(Locale.ROOT).split("\\|");
for (String name : names)
{
// System.out.println("Found name : " + name);
for (String name : names)
{
// System.out.println("Found name : " + name);
@@
-185,7
+187,7
@@
public class PDBStructureChooserQuerySource
{
return false;
}
{
return false;
}
- seqName = seqName.toLowerCase();
+ seqName = seqName.toLowerCase(Locale.ROOT);
for (String ignoredEntry : ignoreList.split(","))
{
if (seqName.contains(ignoredEntry))
for (String ignoredEntry : ignoreList.split(","))
{
if (seqName.contains(ignoredEntry))
@@
-238,25
+240,32
@@
public class PDBStructureChooserQuerySource
public List<FilterOption> getAvailableFilterOptions(String VIEWS_FILTER)
{
List<FilterOption> filters = new ArrayList<FilterOption>();
public List<FilterOption> getAvailableFilterOptions(String VIEWS_FILTER)
{
List<FilterOption> filters = new ArrayList<FilterOption>();
- filters.add(new FilterOption(
+ filters.add(new FilterOption("PDBe "+
MessageManager.getString("label.best_quality"),
MessageManager.getString("label.best_quality"),
- "overall_quality", VIEWS_FILTER, false));
- filters.add(new FilterOption(
+ "overall_quality", VIEWS_FILTER, false,this));
+ filters.add(new FilterOption("PDBe "+
MessageManager.getString("label.best_resolution"),
MessageManager.getString("label.best_resolution"),
- "resolution", VIEWS_FILTER, false));
- filters.add(new FilterOption(
+ "resolution", VIEWS_FILTER, false,this));
+ filters.add(new FilterOption("PDBe "+
MessageManager.getString("label.most_protein_chain"),
MessageManager.getString("label.most_protein_chain"),
- "number_of_protein_chains", VIEWS_FILTER, false));
- filters.add(new FilterOption(
+ "number_of_protein_chains", VIEWS_FILTER, false,this));
+ filters.add(new FilterOption("PDBe "+
MessageManager.getString("label.most_bound_molecules"),
MessageManager.getString("label.most_bound_molecules"),
- "number_of_bound_molecules", VIEWS_FILTER, false));
- filters.add(new FilterOption(
+ "number_of_bound_molecules", VIEWS_FILTER, false,this));
+ filters.add(new FilterOption("PDBe "+
MessageManager.getString("label.most_polymer_residues"),
MessageManager.getString("label.most_polymer_residues"),
- "number_of_polymer_residues", VIEWS_FILTER, true));
+ "number_of_polymer_residues", VIEWS_FILTER, true,this));
return filters;
}
return filters;
}
+ @Override
+ public boolean needsRefetch(FilterOption selectedFilterOpt)
+ {
+ // PDBe queries never need a refetch first
+ return false;
+ }
+
/**
* FTSRestClient specific query builder to pick top ranked entry from a
* fetchStructuresMetaData query
/**
* FTSRestClient specific query builder to pick top ranked entry from a
* fetchStructuresMetaData query