From: zapata Date: Thu, 1 Jun 2006 17:57:20 +0000 (+0000) Subject: replaced some gnu RE's with the much faster jakarta ORO X-Git-Tag: LATEST_MERGED_1_1~60 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=4368e83f65cd067f2ac70668e35cd1ab4432c4d6 replaced some gnu RE's with the much faster jakarta ORO --- diff --git a/lib/oro-2.0.8.jar b/lib/oro-2.0.8.jar new file mode 100644 index 00000000..23488d26 Binary files /dev/null and b/lib/oro-2.0.8.jar differ diff --git a/source/mir/misc/StringUtil.java b/source/mir/misc/StringUtil.java index fc9b84ad..a4686979 100755 --- a/source/mir/misc/StringUtil.java +++ b/source/mir/misc/StringUtil.java @@ -40,18 +40,13 @@ import java.util.TimeZone; public final class StringUtil { private static TimeZone UTC = TimeZone.getTimeZone("UTC"); - private static RE re_newline2br, re_brbr2p, re_mail, re_url, re_tags, - re_tables, re_forbiddenTags; + private static RE re_tags, re_tables, re_forbiddenTags; private StringUtil() { } // this avoids contruction static { try { //precompile regex - re_newline2br = new RE("(\r?\n){1}"); - re_brbr2p = new RE("(
\r?\n
){1,}"); - re_mail = new RE("\\b([a-zA-Z0-9_.-]+)@([a-zA-Z0-9_-]+)\\.([a-zA-Z0-9_.-]+)\\b"); - re_url = new RE("((https://)|(http://)|(ftp://)){1}([a-zA-Z0-9_-]+).([a-zA-Z0-9_.:-]+)/?([^ \t\r\n<>\\)\\]]+[^ \t\r\n.,<>\\)\\]])"); re_tags = new RE("<[^>]*>",RE.REG_ICASE); re_tables = new RE("<[ \t\r\n/]*(table|td|tr)[ \t\r\n]*>",RE.REG_ICASE); re_forbiddenTags = new RE("<[ \t\r\n/]*(html|meta|body|head|script)[ \t\r\n]*>",RE.REG_ICASE); @@ -89,23 +84,6 @@ public final class StringUtil { } /** - * Wandelt Calendar in einen 12-ziffrigen String um (yyyymmddhhmm) - * @param theDate - * @return 12-ziffriger String (yyyymmdd) - */ - - public static final String date2webdbDateTime (GregorianCalendar theDate) { - StringBuffer webdbDate = new StringBuffer(); - webdbDate.append(String.valueOf(theDate.get(Calendar.YEAR))); - webdbDate.append(pad2(theDate.get(Calendar.MONTH) + 1)); - webdbDate.append(pad2(theDate.get(Calendar.DATE))); - webdbDate.append(pad2(theDate.get(Calendar.HOUR))); - webdbDate.append(pad2(theDate.get(Calendar.MINUTE))); - - return webdbDate.toString(); - } - - /** * Return a http://www.w3.org/TR/NOTE-datetime formatted date (yyyy-mm-ddThh:mm:ssTZ) * @param theDate * @return w3approved datetime @@ -157,22 +135,6 @@ public final class StringUtil { } /** - * deleteForbiddenTags - * this method deletes all