svn commit: r814022 - in /lucene/tika/trunk/tika-core/src/main/java/org/apache/tika: mime/MimeType.java utils/StringUtil.java

[jukka]

Author: jukka
Date: Fri Sep 11 20:45:34 2009
New Revision: 814022

URL: http://svn.apache.org/viewvc?rev=814022&view=rev
Log:
TIKA-276: Drop the StringUtils class

Removed:
    
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/StringUtil.java
Modified:
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeType.java

Modified: 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeType.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeType.java?rev=814022&r1=814021&r2=814022&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeType.java 
(original)
+++ 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeType.java 
Fri Sep 11 20:45:34 2009
@@ -23,8 +23,6 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
-import org.apache.tika.utils.StringUtil;
-
 /**
  * Internet media type.
  */
@@ -336,15 +334,14 @@
             this.type = type;
             this.namespaceURI = namespaceURI;
             this.localName = localName;
-            if ((StringUtil.isEmpty(namespaceURI))
-                    && (StringUtil.isEmpty(localName))) {
+            if (isEmpty(namespaceURI) && isEmpty(localName)) {
                 throw new IllegalArgumentException(
                         "Both namespaceURI and localName cannot be null");
             }
             String regex = null;
-            if (StringUtil.isEmpty(namespaceURI)) {
+            if (isEmpty(namespaceURI)) {
                 regex = ".*<" + localName + "[^<>]*>.*";
-            } else if (StringUtil.isEmpty(localName)) {
+            } else if (isEmpty(localName)) {
                 regex = ".*<[^<>]*\\p{Space}xmlns=[\"\']?" + namespaceURI
                         + "[\"\']?[^<>]*>.*";
             } else {
@@ -364,14 +361,14 @@
 
         boolean matches(String namespaceURI, String localName) {
             //Compare namespaces
-            if (!(StringUtil.isEmpty(this.namespaceURI))) {
+            if (!isEmpty(this.namespaceURI)) {
                 if (!this.namespaceURI.equals(namespaceURI)) {
                     return false;
                 }
             }
 
             //Compare root element's local name
-            if (!StringUtil.isEmpty(this.localName)) {
+            if (!isEmpty(this.localName)) {
                 if (!this.localName.equals(localName)) {
                     return false;
                 }
@@ -379,6 +376,13 @@
             return true;
         }
 
+        /**
+         * Checks if a string is null or empty.
+         */
+        private boolean isEmpty(String str) {
+            return (str == null) || (str.equals(""));
+        }
+
         MimeType getType() {
             return type;
         }