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
Jalview-JS/JAL-3253-applet also comments relating to JAL-3268
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
Pdb.java
diff --git
a/src/jalview/ws/dbsources/Pdb.java
b/src/jalview/ws/dbsources/Pdb.java
index
a658089
..
d12c271
100644
(file)
--- a/
src/jalview/ws/dbsources/Pdb.java
+++ b/
src/jalview/ws/dbsources/Pdb.java
@@
-36,6
+36,7
@@
import jalview.io.FormatAdapter;
import jalview.io.PDBFeatureSettings;
import jalview.structure.StructureImportSettings;
import jalview.util.MessageManager;
import jalview.io.PDBFeatureSettings;
import jalview.structure.StructureImportSettings;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.ws.ebi.EBIFetchClient;
import java.io.File;
import jalview.ws.ebi.EBIFetchClient;
import java.io.File;
@@
-56,6
+57,8
@@
public class Pdb extends EbiFileRetrievedProxy
private static final int PDB_ID_LENGTH = 4;
private static final int PDB_ID_LENGTH = 4;
+ private static Regex ACCESSION_REGEX;
+
public Pdb()
{
super();
public Pdb()
{
super();
@@
-80,7
+83,12
@@
public class Pdb extends EbiFileRetrievedProxy
@Override
public Regex getAccessionValidator()
{
@Override
public Regex getAccessionValidator()
{
- return new Regex("([1-9][0-9A-Za-z]{3}):?([ _A-Za-z0-9]?)");
+ if (ACCESSION_REGEX == null)
+ {
+ ACCESSION_REGEX = Platform
+ .newRegex("([1-9][0-9A-Za-z]{3}):?([ _A-Za-z0-9]?)", null);
+ }
+ return ACCESSION_REGEX;
}
/*
}
/*
@@
-169,7
+177,7
@@
public class Pdb extends EbiFileRetrievedProxy
fileFormat);
if (pdbAlignment != null)
{
fileFormat);
if (pdbAlignment != null)
{
- List<SequenceI> toremove = new ArrayList<SequenceI>();
+ List<SequenceI> toremove = new ArrayList<>();
for (SequenceI pdbcs : pdbAlignment.getSequences())
{
String chid = null;
for (SequenceI pdbcs : pdbAlignment.getSequences())
{
String chid = null;