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
Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace
[jalview.git]
/
src
/
jalview
/
gui
/
structurechooser
/
ThreeDBStructureChooserQuerySource.java
diff --git
a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index
28c41e9
..
76ef85f
100644
(file)
--- a/
src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/
src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@
-310,7
+310,7
@@
public class ThreeDBStructureChooserQuerySource
&& tdBeaconsFilters.contains(fieldToFilterBy);
}
&& tdBeaconsFilters.contains(fieldToFilterBy);
}
- private String remove_prefix(String fieldToFilterBy)
+ protected String remove_prefix(String fieldToFilterBy)
{
if (tdBeaconsFilters != null
&& tdBeaconsFilters.contains(fieldToFilterBy)
{
if (tdBeaconsFilters != null
&& tdBeaconsFilters.contains(fieldToFilterBy)
@@
-453,7
+453,10
@@
public class ThreeDBStructureChooserQuerySource
pdbEntry.setRetrievalUrl(urlStr);
}
pdbEntry.setProvider(typeColumn);
pdbEntry.setRetrievalUrl(urlStr);
}
pdbEntry.setProvider(typeColumn);
- pdbEntry.setProviderPage(modelPage);
+ if (modelPage != null)
+ {
+ pdbEntry.setProviderPage(modelPage);
+ }
selectedSeq.getDatasetSequence().addPDBId(pdbEntry);
}
pdbEntriesToView[count++] = pdbEntry;
selectedSeq.getDatasetSequence().addPDBId(pdbEntry);
}
pdbEntriesToView[count++] = pdbEntry;
@@
-584,7
+587,7
@@
public class ThreeDBStructureChooserQuerySource
{
if (!hasPdbResp)
{
{
if (!hasPdbResp)
{
- System.out.println(
+ jalview.bin.Console.outPrintln(
"Warning: seems like we couldn't get to the PDBe search interface.");
}
else
"Warning: seems like we couldn't get to the PDBe search interface.");
}
else