$2|gx", s);
- s = s_re.substitute("s|\u0001|=|gx", s);
+ s = s.replaceAll("\\=+([a-zA-Z_0-9]+)+\\=", "$1");
if (s_log.isDebugEnabled()) {
s_log.debug("After styles {" + s + "}");
}
- // Links are next on the list @text(url)
- s = s_re.substitute("s|@@|\u0001|gx", s);
- s = s_re.substitute("s|@([^\\(@]+)\\(([^\\)]+)\\)|$1|gx", s);
- s = s_re.substitute("s|\u0001|@|gx", s);
- if (s_log.isDebugEnabled()) {
- s_log.debug("After links pass two {" + s + "}");
- }
+ // untitled mailto
+ //"mailto:dan@berrange.com" to
+ //"mailto:dan@berrange.com"
+ s = s.replaceAll("mailto:([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})\\b",
+ "mailto:$1");
- // Finally we can unobscure the hyperlinks
- s = smartTextReplace(new UnobscureSubstitution(links),
- "\u0002([^\u0002]+)\u0002", s);
- s = s_re.substitute("s|\u0001|@|gx", s);
- if (s_log.isDebugEnabled()) {
- s_log.debug("After links pass three {" + s + "}");
- }
+ //adding a '@' before every untitled link so it does not interfere with
+ // titled links
+ s = s.replaceAll("(http[s]*://www\\..+\\.[A-Za-z]{2,4})",
+ "@$1");
+
+ // titled Links
+ //"@google(http://www.google.com) to
+ //google"
+ s = s.replaceAll("@(\\w+)\\(@(http*[s]*:*/*/*www\\..+\\.[A-Za-z]{2,4})\\)",
+ "$1");
+ //titled mailto
+ //"@Dan B(mailto:dan@@berrange.com)" to
+ //"Dan B"
+ s = s.replaceAll("@([\\w\\s]+)\\(mailto:([a-zA-Z0-9._%+-]+@@[a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})\\)",
+ "$1");
+ //remove one of the two @'s
+ s = s.replaceAll("mailto:([a-zA-Z0-9._%+-]+)+@@([a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})",
+ "mailto:$1@$2");
+
+ //untitled links (which got an '@' in front now)
+ s = s.replaceAll("@(http[s]*://www\\..+\\.[A-Za-z]{2,4})",
+ "$1");
- // And those entities
- s = smartTextReplace(new EntitySubstitution(),
- "\u0003([^\u0003]+)\u0003", s);
if (s_log.isDebugEnabled()) {
- s_log.debug("After entities (complete) {" + s + "}");
+ s_log.debug("After links {" + s + "}");
}
return s;
}
/**
+ * same as replaceAll()?
*
* @param subst
* @param pattern
@@ -367,122 +372,120 @@ public class StringUtils {
throw new UncheckedWrapperException("cannot perform substitution", e);
}
return result.toString();
+
}
/**
*
*/
- private static class TitledLinkSubstitution implements Substitution {
-
- private Map m_hash;
-
- public TitledLinkSubstitution(Map hash) {
- m_hash = hash;
- }
-
- @Override
- public void appendSubstitution(StringBuffer appendBuffer,
- MatchResult match,
- int substitutionCount,
- PatternMatcherInput originalInput,
- PatternMatcher matcher,
- Pattern pattern) {
- String title = match.group(1);
- String link = match.group(2);
- s_log.debug("Link: " + link);
-
- Integer i = m_hash.size();
- s_log.debug("Key: " + i);
- m_hash.put(i, link);
- String dst = "@" + title + "(\u0002" + i.toString() + "\u0002)";
- appendBuffer.append(dst);
- s_log.debug("Encoded Link: " + dst);
- }
- }
-
- /**
- *
- */
- private static class UntitledLinkSubstitution implements Substitution {
-
- private Map m_hash;
-
- public UntitledLinkSubstitution(Map hash) {
- m_hash = hash;
- }
-
- public void appendSubstitution(StringBuffer appendBuffer,
- MatchResult match,
- int substitutionCount,
- PatternMatcherInput originalInput,
- PatternMatcher matcher,
- Pattern pattern) {
- String link = match.group(1);
- s_log.debug("Link: " + link);
-
- Integer i = m_hash.size();
- s_log.debug("Key: " + i);
- m_hash.put(i, link);
- String dst = "@\u0002" + i.toString() + "\u0002(\u0002"
- + i.toString() + "\u0002)";
- appendBuffer.append(dst);
- s_log.debug("Encoded Link: " + dst);
- }
- }
-
- /**
- *
- */
- private static class UnobscureSubstitution implements Substitution {
-
- private Map m_hash;
-
- public UnobscureSubstitution(Map hash) {
- m_hash = hash;
- }
-
- public void appendSubstitution(StringBuffer appendBuffer,
- MatchResult match,
- int substitutionCount,
- PatternMatcherInput originalInput,
- PatternMatcher matcher,
- Pattern pattern) {
- String s = match.group(1);
- s_log.debug("Key: " + s);
-
- Integer i = Integer.valueOf(s);
- appendBuffer.append((String) m_hash.get(i));
- s_log.debug("Link: " + m_hash.get(i));
- }
- }
-
- /**
- *
- */
- private static class EntitySubstitution implements Substitution {
-
- public void appendSubstitution(StringBuffer appendBuffer,
- MatchResult match,
- int substitutionCount,
- PatternMatcherInput originalInput,
- PatternMatcher matcher,
- Pattern pattern) {
- String s = match.group(1);
- s_log.debug("Key: " + s);
-
- appendBuffer.append((String) s_entities.get(s));
- s_log.debug("Entity: " + s_entities.get(s));
- }
- }
+// private static class TitledLinkSubstitution implements Substitution {
+//
+// private Map m_hash;
+//
+// public TitledLinkSubstitution(Map hash) {
+// m_hash = hash;
+// }
+//
+// @Override
+// public void appendSubstitution(StringBuffer appendBuffer,
+// MatchResult match,
+// int substitutionCount,
+// PatternMatcherInput originalInput,
+// PatternMatcher matcher,
+// Pattern pattern) {
+// String title = match.group(1);
+// String link = match.group(2);
+// s_log.debug("Link: " + link);
+//
+// Integer i = m_hash.size();
+// s_log.debug("Key: " + i);
+// m_hash.put(i, link);
+// String dst = "@" + title + "(\u0002" + i.toString() + "\u0002)";
+// appendBuffer.append(dst);
+// s_log.debug("Encoded Link: " + dst);
+// }
+// }
+// /**
+// *
+// */
+// private static class UnobscureSubstitution implements Substitution {
+//
+// private Map m_hash;
+//
+// public UnobscureSubstitution(Map hash) {
+// m_hash = hash;
+// }
+//
+// public void appendSubstitution(StringBuffer appendBuffer,
+// MatchResult match,
+// int substitutionCount,
+// PatternMatcherInput originalInput,
+// PatternMatcher matcher,
+// Pattern pattern) {
+// String s = match.group(1);
+// s_log.debug("Key: " + s);
+//
+// Integer i = Integer.valueOf(s);
+// appendBuffer.append((String) m_hash.get(i));
+// s_log.debug("Link: " + m_hash.get(i));
+// }
+// }
+//
+// /**
+// *
+// */
+// private static class EntitySubstitution implements Substitution {
+//
+// public void appendSubstitution(StringBuffer appendBuffer,
+// MatchResult match,
+// int substitutionCount,
+// PatternMatcherInput originalInput,
+// PatternMatcher matcher,
+// Pattern pattern) {
+// String s = match.group(1);
+// s_log.debug("Key: " + s);
+//
+// appendBuffer.append((String) s_entities.get(s));
+// s_log.debug("Entity: " + s_entities.get(s));
+// }
+// }
+//
+// private Map m_hash;
+//
+// public UntitledLinkSubstitution(Map hash) {
+// m_hash = hash;
+// }
+//
+// public void appendSubstitution(StringBuffer appendBuffer,
+// MatchResult match,
+// int substitutionCount,
+// PatternMatcherInput originalInput,
+// PatternMatcher matcher,
+// Pattern pattern) {
+// String link = match.group(1);
+// s_log.debug("Link: " + link);
+//
+// Integer i = m_hash.size();
+// s_log.debug("Key: " + i);
+// m_hash.put(i, link);
+// String dst = "@\u0002" + i.toString() + "\u0002(\u0002"
+// + i.toString() + "\u0002)";
+// appendBuffer.append(dst);
+// s_log.debug("Encoded Link: " + dst);
+// }
+// }
/**
* Convert a string of items separated by a separator character to an
* (string)array of the items. sep is the separator character. Example:
- * Input - s == "cat,house,dog" sep==',' Output - {"cat", "house", "dog"}
+ * Input - s == "cat,house,dog,," sep==',' Output - {"cat", "house", "dog",
+ * "" ,""} different to java.lang.String.split(): Input - s ==
+ * "cat,house,dog,," sep==',' Output - {"cat", "house", "dog"}
*
* @param s string contains items separated by a separator character.
* @param sep separator character.
* @return Array of items.
+ *
*/
public static String[] split(String s, char sep) {
ArrayList al = new ArrayList();
@@ -564,7 +567,7 @@ public class StringUtils {
* specifically: @a = /(RE)|(.+)/g;
*
*/
- public static List splitUp(String s, String re) {
+ public static List splitUp(String s, String re) {
Perl5Util p5 = new Perl5Util();
ArrayList list = new ArrayList();
@@ -782,15 +785,8 @@ public class StringUtils {
* @post result.indexOf('\n') == 0
*/
public static String stripNewLines(String str) {
- int len = str.length();
- StringBuffer sb = new StringBuffer(len);
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- if (ch != '\r' && ch != '\n') {
- sb.append(ch);
- }
- }
- return sb.toString();
+
+ return str.replaceAll("[\\n\\r]", "");
}
/**
@@ -1069,28 +1065,27 @@ public class StringUtils {
* @see java.text.MessageFormat
*
* @param text the text to interpolate
- * @param vars a hash table containing key -> value mappings
+ * @param vars a hash table containing key -> value mappings ////
*/
- public static String interpolate(String text, Map vars) {
- HashSubstitution subst = new HashSubstitution(vars);
- Perl5Matcher matcher = new Perl5Matcher();
- Perl5Compiler compiler = new Perl5Compiler();
- StringBuffer result = new StringBuffer();
- PatternMatcherInput input = new PatternMatcherInput(text);
-
- try {
- Util.substitute(result,
- matcher,
- compiler.compile("(::(?:\\w+(?:[.-]+\\w+)*)::)"),
- subst,
- input,
- Util.SUBSTITUTE_ALL);
- } catch (MalformedPatternException e) {
- throw new UncheckedWrapperException("cannot perform substitution", e);
- }
- return result.toString();
- }
-
+// public static String interpolate(String text, Map vars) {
+// HashSubstitution subst = new HashSubstitution(vars);
+// Perl5Matcher matcher = new Perl5Matcher();
+// Perl5Compiler compiler = new Perl5Compiler();
+// StringBuffer result = new StringBuffer();
+// PatternMatcherInput input = new PatternMatcherInput(text);
+//
+// try {
+// Util.substitute(result,
+// matcher,
+// compiler.compile("(::(?:\\w+(?:[.-]+\\w+)*)::)"),
+// subst,
+// input,
+// Util.SUBSTITUTE_ALL);
+// } catch (MalformedPatternException e) {
+// throw new UncheckedWrapperException("cannot perform substitution", e);
+// }
+// return result.toString();
+// }
/**
* THis method performs a single variable substitution on a string. The
* placeholder takes the form of ::key:: within the sample text.
@@ -1117,44 +1112,10 @@ public class StringUtils {
public static String replace(final String str,
final String find,
final String replace) {
-
- Assert.exists(find, String.class);
- Assert.exists(replace, String.class);
-
if (str == null) {
return null;
}
-
- int cur = str.indexOf(find);
- if (cur < 0) {
- return str;
- }
-
- final int findLength = find.length();
- // If replace is longer than find, assume the result is going to be
- // slightly longer than the original string.
- final int bufferLength
- = replace.length() > findLength ? (int) (str.length() * 1.1) : str.length();
- StringBuffer sb = new StringBuffer(bufferLength);
- int last = 0;
-
- if (cur == 0) {
- sb.append(replace);
- cur = str.indexOf(find, cur + findLength);
- last = findLength;
- }
-
- while (cur > 0) {
- sb.append(str.substring(last, cur));
- sb.append(replace);
- last = cur + findLength;
- cur = str.indexOf(find, cur + findLength);
- }
- if (last < str.length() - 1) {
- sb.append(str.substring(last));
- }
-
- return sb.toString();
+ return str.replace(find, replace);
}
/**
@@ -1174,69 +1135,68 @@ public class StringUtils {
/**
*
*/
- private static class HashSubstitution implements Substitution {
-
- private Map m_hash;
-
- public HashSubstitution(Map hash) {
- m_hash = hash;
- }
-
- public void appendSubstitution(StringBuffer appendBuffer,
- MatchResult match,
- int substitutionCount,
- PatternMatcherInput originalInput,
- PatternMatcher matcher,
- Pattern pattern) {
- String placeholder = match.toString();
- String key = placeholder.substring(2, placeholder.length() - 2);
-
- Object value = (m_hash.containsKey(key)
- ? m_hash.get(key)
- : placeholder);
-
- if (s_log.isDebugEnabled()) {
- Object hashValue = m_hash.get(key);
-
- s_log.debug("Placeholder: " + placeholder);
- s_log.debug("Key: " + key);
- if (null != value) {
- s_log.debug("Value (" + value.getClass().getName()
- + "): " + value.toString());
- }
- if (null != hashValue) {
- s_log.debug("Hash Value ("
- + hashValue.getClass().getName() + "): "
- + hashValue.toString());
- }
- }
-
- value = (m_hash.containsKey(key) ? m_hash.get(key) : "");
-
- String val;
- if (value instanceof PlaceholderValueGenerator) {
- PlaceholderValueGenerator gen = (PlaceholderValueGenerator) value;
- val = gen.generate(key);
- } else if (value.getClass().isArray()) {
- Object[] values = (Object[]) value;
-
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < values.length; i++) {
- buf.append(values[i].toString());
- if ((values.length - 1) != i) {
- buf.append(", ");
- }
- }
-
- val = buf.toString();
- } else {
- val = value.toString();
- }
-
- appendBuffer.append(val);
- }
- }
-
+// private static class HashSubstitution implements Substitution {
+//
+// private Map m_hash;
+//
+// public HashSubstitution(Map hash) {
+// m_hash = hash;
+// }
+//
+// public void appendSubstitution(StringBuffer appendBuffer,
+// MatchResult match,
+// int substitutionCount,
+// PatternMatcherInput originalInput,
+// PatternMatcher matcher,
+// Pattern pattern) {
+// String placeholder = match.toString();
+// String key = placeholder.substring(2, placeholder.length() - 2);
+//
+// Object value = (m_hash.containsKey(key)
+// ? m_hash.get(key)
+// : placeholder);
+//
+// if (s_log.isDebugEnabled()) {
+// Object hashValue = m_hash.get(key);
+//
+// s_log.debug("Placeholder: " + placeholder);
+// s_log.debug("Key: " + key);
+// if (null != value) {
+// s_log.debug("Value (" + value.getClass().getName()
+// + "): " + value.toString());
+// }
+// if (null != hashValue) {
+// s_log.debug("Hash Value ("
+// + hashValue.getClass().getName() + "): "
+// + hashValue.toString());
+// }
+// }
+//
+// value = (m_hash.containsKey(key) ? m_hash.get(key) : "");
+//
+// String val;
+// if (value instanceof PlaceholderValueGenerator) {
+// PlaceholderValueGenerator gen = (PlaceholderValueGenerator) value;
+// val = gen.generate(key);
+// } else if (value.getClass().isArray()) {
+// Object[] values = (Object[]) value;
+//
+// StringBuffer buf = new StringBuffer();
+// for (int i = 0; i < values.length; i++) {
+// buf.append(values[i].toString());
+// if ((values.length - 1) != i) {
+// buf.append(", ");
+// }
+// }
+//
+// val = buf.toString();
+// } else {
+// val = value.toString();
+// }
+//
+// appendBuffer.append(val);
+// }
+// }
/**
* @throws NullPointerException if throwable is null
*/
diff --git a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java
index 0747a9ecd..4c2364ab2 100644
--- a/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java
+++ b/ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java
@@ -142,7 +142,105 @@ public class StringUtilsTest {
+ "\n";
String actual = StringUtils.smartTextToHtml(src);
- assertTrue(expected.equals(actual));
+// assertTrue(expected.equals(actual));
+ String errMsg = "smartTexttoHtml, expected = " + expected
+ + " found = " + actual;
+ assertEquals(errMsg, expected, actual);
+
+ }
+
+ @Test
+ public void testSmartTextHR() {
+ String src = "---";
+
+ String expected = "paragraph contains\n"
+ + "a link to http://www.google.com\n"
+ + "and now the end is near, lets test\n"
+ + "google a few\n"
+ + "titled links, including a mailto\n"
+ + "Dan B\n"
+ + "this is the text
newline .