Index: /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java (revision 1289)
+++ /FCKeditor.Java/branches/2.4/src/main/java/com/fredck/fckeditor/tool/Utils.java (revision 1290)
@@ -25,6 +25,4 @@
import java.util.StringTokenizer;
-import org.apache.commons.io.FilenameUtils;
-
/**
* Some static helper methods.
@@ -35,137 +33,87 @@
public class Utils {
- /**
- * Gets the base name of a file name without extension.
- *
- * @param fileName
- * @return Empty string, if fileName is null or empty, or the base name.
- * @see FilenameUtils#getBaseName(String)
- */
- @Deprecated
- public static String getNameWithoutExtension(final String fileName) {
- return fileName.substring(0, fileName.lastIndexOf("."));
- }
+ /**
+ * Constructs a set of uppercased strings from a 'delimiter' separated string.
+ *
+ * @param stringList
+ * @param delimiter
+ * The delimiter. It shouldn't be empty!
+ * @return An emtpy list, if 'stringList' is empty, or an uppercased set of strings.
+ * @throws IllegalArgumentException if 'delimiter' is empty.
+ */
+ public static Set getSet(final String stringList, final String delimiter) {
+ if (isEmpty(delimiter))
+ throw new IllegalArgumentException("Argument 'delimiter' shouldn't be empty!");
+ if (stringList == null || isEmpty(stringList))
+ return new HashSet();
- /**
- * Gets the extension of a file name.
- *
- * @param fileName
- * @return Extension of 'fileName'.
- * @see FilenameUtils#getExtension(String)
- */
-
- @Deprecated
- public static String getExtension(final String fileName) {
- return fileName.substring(fileName.lastIndexOf(".") + 1);
- }
+ Set set = new HashSet();
+ StringTokenizer st = new StringTokenizer(stringList, delimiter);
+ while (st.hasMoreTokens()) {
+ String tmp = st.nextToken();
+ if (isNotEmpty(tmp)) // simple empty filter
+ set.add(tmp.toLowerCase());
+ }
+ return set;
+ }
- /**
- * Constructs a set of uppercased strings dependend on 'delimiter'.
- *
- * @param stringList
- * @param delimiter
- * The delimiter. It shouldn't be blank!
- * @return An emtpy list, if 'stringList' is null, or an uppercased set of
- * strings.
- */
- public static Set getSet(final String stringList, final String delimiter) {
- if (stringList == null || stringList.length() < 1)
- return new HashSet();
+ /**
+ * Just a wrapper to {@link #getSet(String, String)} for using '|' as delimiter.
+ */
+ public static Set getSet(final String stringlist) {
+ return getSet(stringlist, "|");
+ }
- Set set = new HashSet();
- StringTokenizer st = new StringTokenizer(stringList, delimiter);
- while (st.hasMoreTokens()) {
- String tmp = st.nextToken();
- if (isNotBlank(tmp)) // simple blank filter
- set.add(tmp.toLowerCase());
+ /**
+ * Checks if a string is null or empty.
+ *
+ * @param str
+ * to check
+ * @return true if the String is empty or null
+ */
+ public static boolean isEmpty(final String str) {
+ return str == null || str.length() == 0;
}
- return set;
- }
- /**
- * Just a wrapper to {@link #getSet(String, String)} for using '|' as
- * delimiter.
- */
- public static Set getSet(final String stringlist) {
- return getSet(stringlist, "|");
- }
+ /**
+ * Just a wrapper to {@link #isEmpty(String)}.
+ *
+ * @param str
+ * @return true if the String is not empty and not nul
+ */
+ public static boolean isNotEmpty(final String str) {
+ return !isEmpty(str);
+ }
- /**
- * Checks if a string is null or empty.
- *
- * @param string
- * @return True if 'string' is null or empty, or false.
- * @deprecated Method name has been discouraged to line up with Commons Lang.
- * isBlank is different from isEmpty
- * @see Utils#isEmpty(String)
- * @see Commons Lang
- */
- @Deprecated
- public static boolean isBlank(final String string) {
- return (string == null || string.length() < 1) ? true : false;
- }
-
- /**
- * Checks if a string is null or empty.
- *
- * @param str to check
- * @return true if the String is empty or null
- */
- public static boolean isEmpty (final String str) {
- return str == null || str.length() == 0;
- }
+ /**
+ * Replaces all 'search' with 'replacement' in 'string'.
+ *
+ *
+ * Utils.replaceAll(null, *, *) = ""
+ * Utils.replaceAll("", *, *) = ""
+ * Utils.replaceAll("foo", null, *) = "foo"
+ * Utils.replaceAll("foo", "o", "a") = "faa"
+ *
+ *
+ * @param string
+ * @param search
+ * @param replacement
+ * @return
+ */
+ public static String replaceAll(final String string, final String search, final String replacement) {
+ if (isEmpty(string))
+ return "";
+ if (isEmpty(search))
+ return string;
+ if (string.indexOf(search) == -1)
+ return string;
+ StringBuffer strb = new StringBuffer(string);
+ int pos = strb.indexOf(search);
- /**
- * Just a wrapper to {@link #isBlank(String)}.
- *
- * @param string
- * @return
- */
- @Deprecated
- public static boolean isNotBlank(final String string) {
- return !isBlank(string);
- }
- /**
- * Just a wrapper to {@link #isEmpty(String)}.
- *
- * @param str
- * @return true if the String is not empty and not nul
- */
-
- public static boolean isNotEmpty(final String str) {
- return !isEmpty(str);
- }
-
- /**
- * Replaces all 'search' with 'replacement' in 'string'.
- *
- *
- * Utils.replaceAll(null, *, *) = ""
- * Utils.replaceAll("", *, *) = ""
- * Utils.replaceAll("foo", null, *) = "foo"
- * Utils.replaceAll("foo", "o", "a") = "faa"
- *
- *
- * @param string
- * @param search
- * @param replacement
- * @return
- */
- public static String replaceAll(final String string, final String search,
- final String replacement) {
- if (isEmpty(string))
- return "";
- if (isEmpty(search))
- return string;
- if (string.indexOf(search) == -1)
- return string;
- StringBuffer strb = new StringBuffer(string);
- int pos = strb.indexOf(search);
-
- while (pos != -1) {
- strb.replace(pos, pos + search.length(), replacement);
- pos = strb.indexOf(search);
+ while (pos != -1) {
+ strb.replace(pos, pos + search.length(), replacement);
+ pos = strb.indexOf(search);
+ }
+ return strb.toString();
}
- return strb.toString();
- }
}