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-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
analysis
/
ParseProperties.java
diff --git
a/src/jalview/analysis/ParseProperties.java
b/src/jalview/analysis/ParseProperties.java
index
4b68d93
..
9937a47
100644
(file)
--- a/
src/jalview/analysis/ParseProperties.java
+++ b/
src/jalview/analysis/ParseProperties.java
@@
-23,6
+23,7
@@
package jalview.analysis;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
+import jalview.util.Platform;
import com.stevesoft.pat.Regex;
import com.stevesoft.pat.Regex;
@@
-90,7
+91,7
@@
public class ParseProperties
String[] ScoreDescriptions, String regex, boolean repeat)
{
int count = 0;
String[] ScoreDescriptions, String regex, boolean repeat)
{
int count = 0;
- Regex pattern = new Regex(regex);
+ Regex pattern = Platform.newRegex(regex, null);
if (pattern.numSubs() > ScoreNames.length)
{
// Check that we have enough labels and descriptions for any parsed
if (pattern.numSubs() > ScoreNames.length)
{
// Check that we have enough labels and descriptions for any parsed
@@
-134,7
+135,7
@@
public class ParseProperties
double score = Double.NaN;
try
{
double score = Double.NaN;
try
{
- score = Double.valueOf(sstring).doubleValue();
+ score = new Double(sstring).doubleValue();
} catch (Exception e)
{
// don't try very hard to parse if regex was wrong.
} catch (Exception e)
{
// don't try very hard to parse if regex was wrong.