Merge pull request #87 from bd2019us/JOSHUA-342
Using replace() instead of replaceAll() for non-regex patterns
diff --git a/src/main/java/org/apache/joshua/decoder/ff/FeatureVector.java b/src/main/java/org/apache/joshua/decoder/ff/FeatureVector.java
index 34f19ae..89d729a 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/FeatureVector.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/FeatureVector.java
@@ -338,7 +338,7 @@
// First print all the dense feature names in order
for (int i = 0; i < DENSE_FEATURE_NAMES.size(); i++) {
- outputString.append(String.format("%s=%.3f ", DENSE_FEATURE_NAMES.get(i).replaceAll("_", "-"), getDense(i)));
+ outputString.append(String.format("%s=%.3f ", DENSE_FEATURE_NAMES.get(i).replace("_", "-"), getDense(i)));
printed_keys.add(DENSE_FEATURE_NAMES.get(i));
}
diff --git a/src/main/java/org/apache/joshua/mira/MIRACore.java b/src/main/java/org/apache/joshua/mira/MIRACore.java
index 9ba046d..3272115 100755
--- a/src/main/java/org/apache/joshua/mira/MIRACore.java
+++ b/src/main/java/org/apache/joshua/mira/MIRACore.java
@@ -2795,11 +2795,11 @@
return str;
// replace HTML/SGML
- str = str.replaceAll(""", "\"");
- str = str.replaceAll("&", "&");
- str = str.replaceAll("<", "<");
- str = str.replaceAll(">", ">");
- str = str.replaceAll("'", "'");
+ str = str.replace(""", "\"");
+ str = str.replace("&", "&");
+ str = str.replace("<", "<");
+ str = str.replace(">", ">");
+ str = str.replace("'", "'");
// split on these characters:
// ! " # $ % & ( ) * + / : ; < = > ? @ [ \ ] ^ _ ` { | } ~
diff --git a/src/main/java/org/apache/joshua/util/FormatUtils.java b/src/main/java/org/apache/joshua/util/FormatUtils.java
index ead2db7..61fde97 100644
--- a/src/main/java/org/apache/joshua/util/FormatUtils.java
+++ b/src/main/java/org/apache/joshua/util/FormatUtils.java
@@ -128,9 +128,9 @@
}
public static String unescapeSpecialSymbols(String s) {
- return s.replaceAll("-lsb-", "[")
- .replaceAll("-rsb-", "]")
- .replaceAll("-pipe-", "|");
+ return s.replace("-lsb-", "[")
+ .replace("-rsb-", "]")
+ .replace("-pipe-", "|");
}
/**
diff --git a/src/main/java/org/apache/joshua/zmert/MertCore.java b/src/main/java/org/apache/joshua/zmert/MertCore.java
index 17f6677..47cede9 100644
--- a/src/main/java/org/apache/joshua/zmert/MertCore.java
+++ b/src/main/java/org/apache/joshua/zmert/MertCore.java
@@ -2597,11 +2597,11 @@
if (normMethod == 0) return str;
// replace HTML/SGML
- str = str.replaceAll(""", "\"");
- str = str.replaceAll("&", "&");
- str = str.replaceAll("<", "<");
- str = str.replaceAll(">", ">");
- str = str.replaceAll("'", "'");
+ str = str.replace(""", "\"");
+ str = str.replace("&", "&");
+ str = str.replace("<", "<");
+ str = str.replace(">", ">");
+ str = str.replace("'", "'");