Index: java/src/org/apache/xindice/core/indexer/MemValueIndexer.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/indexer/MemValueIndexer.java,v
retrieving revision 1.8
diff -u -r1.8 MemValueIndexer.java
--- java/src/org/apache/xindice/core/indexer/MemValueIndexer.java	8 Feb 2004 02:50:21 -0000	1.8
+++ java/src/org/apache/xindice/core/indexer/MemValueIndexer.java	13 Jul 2004 19:21:21 -0000
@@ -982,7 +982,7 @@
                 log.debug("Exception while converting value \"" + theValue + "\"  from String to " + itsValueTypeName, anException);
             }
         }
-        return new String();
+        return "";
     }
 
     /**
@@ -1007,7 +1007,7 @@
      */
     private final Object getNextValueOf(Object theValue, int theType) {
         if (theValue instanceof EmptyValue) {
-            return new String("\0");
+            return "\0";
         }
 
         Object aReturn = null;
Index: java/src/org/apache/xindice/core/request/URIMapper.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/request/URIMapper.java,v
retrieving revision 1.19
diff -u -r1.19 URIMapper.java
--- java/src/org/apache/xindice/core/request/URIMapper.java	8 Feb 2004 02:50:54 -0000	1.19
+++ java/src/org/apache/xindice/core/request/URIMapper.java	13 Jul 2004 19:20:36 -0000
@@ -174,7 +174,7 @@
      */
     public String getContentType() {
         // Return the docuement's content type, for now this can only be "text/xml"
-        return new String("text/xml");
+        return "text/xml";
     }
 
     /**
Index: java/src/org/apache/xindice/tools/command/AddDocument.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/AddDocument.java,v
retrieving revision 1.13
diff -u -r1.13 AddDocument.java
--- java/src/org/apache/xindice/tools/command/AddDocument.java	8 Feb 2004 02:57:35 -0000	1.13
+++ java/src/org/apache/xindice/tools/command/AddDocument.java	13 Jul 2004 19:26:56 -0000
@@ -52,7 +52,7 @@
             return false;
         }
 
-        if (table.get(XMLTools.FILE_PATH) == "") {
+        if (((String)table.get(XMLTools.FILE_PATH)).length() == 0) {
             System.out.println("ERROR : File path required");
             return false;
         }
Index: java/src/org/apache/xindice/tools/command/AddIndexer.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/AddIndexer.java,v
retrieving revision 1.10
diff -u -r1.10 AddIndexer.java
--- java/src/org/apache/xindice/tools/command/AddIndexer.java	8 Feb 2004 02:57:35 -0000	1.10
+++ java/src/org/apache/xindice/tools/command/AddIndexer.java	13 Jul 2004 19:26:29 -0000
@@ -90,7 +90,7 @@
                     doc.appendChild(idxEle);
 
                     // If in verbose mode, show....
-                    if (table.get(XMLTools.VERBOSE) == "true") {
+                    if ("true".equals(table.get(XMLTools.VERBOSE))) {
                         String indexstr = TextWriter.toString(doc);
                         System.out.println("Index node element = ");
                         System.out.println("\t" + indexstr + "\n");
Index: java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java,v
retrieving revision 1.11
diff -u -r1.11 AddMultipleDocuments.java
--- java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java	25 May 2004 15:58:46 -0000	1.11
+++ java/src/org/apache/xindice/tools/command/AddMultipleDocuments.java	13 Jul 2004 19:27:07 -0000
@@ -50,7 +50,7 @@
                 return false;
             }
 
-            if (table.get(XMLTools.FILE_PATH) == "") {
+            if (((String)table.get(XMLTools.FILE_PATH)).length() == 0) {
                 System.out.println("ERROR : Directory name and switch required");
                 return false;
             }
Index: java/src/org/apache/xindice/tools/command/AddResource.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/AddResource.java,v
retrieving revision 1.2
diff -u -r1.2 AddResource.java
--- java/src/org/apache/xindice/tools/command/AddResource.java	8 Feb 2004 02:57:35 -0000	1.2
+++ java/src/org/apache/xindice/tools/command/AddResource.java	13 Jul 2004 19:27:20 -0000
@@ -49,7 +49,7 @@
             return false;
         }
 
-        if (table.get(XMLTools.FILE_PATH) == "") {
+        if (((String)table.get(XMLTools.FILE_PATH)).length() == 0) {
             System.out.println("ERROR : File path required");
             return false;
         }
Index: java/src/org/apache/xindice/tools/command/ImportTree.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/ImportTree.java,v
retrieving revision 1.12
diff -u -r1.12 ImportTree.java
--- java/src/org/apache/xindice/tools/command/ImportTree.java	8 Feb 2004 02:57:35 -0000	1.12
+++ java/src/org/apache/xindice/tools/command/ImportTree.java	13 Jul 2004 19:24:01 -0000
@@ -181,7 +181,7 @@
          *          should be included
          */
         public boolean accept(File pathname) {
-            if (this.extension != "") {
+            if (this.extension.length() > 0) {
                 return pathname.getName().endsWith("." + this.extension) || pathname.isDirectory();
             } else {
                 return true;
Index: java/src/org/apache/xindice/tools/command/RetrieveDocument.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/RetrieveDocument.java,v
retrieving revision 1.10
diff -u -r1.10 RetrieveDocument.java
--- java/src/org/apache/xindice/tools/command/RetrieveDocument.java	8 Feb 2004 02:57:35 -0000	1.10
+++ java/src/org/apache/xindice/tools/command/RetrieveDocument.java	13 Jul 2004 19:27:31 -0000
@@ -66,7 +66,7 @@
 
                     String documentstr = (String) resource.getContent();
 
-                    if ((documentstr != null) && (table.get(XMLTools.FILE_PATH) != "")) {
+                    if ((documentstr != null) && (((String)table.get(XMLTools.FILE_PATH)).length() > 0)) {
                         try {
                             File file = new File((String) table.get(XMLTools.FILE_PATH));
                             // Create the directory structure if necessary
Index: java/src/org/apache/xindice/tools/command/XPathQuery.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/XPathQuery.java,v
retrieving revision 1.13
diff -u -r1.13 XPathQuery.java
--- java/src/org/apache/xindice/tools/command/XPathQuery.java	20 May 2004 12:21:46 -0000	1.13
+++ java/src/org/apache/xindice/tools/command/XPathQuery.java	13 Jul 2004 19:25:06 -0000
@@ -100,7 +100,7 @@
     }
 
     private void addNamespaces(XPathQueryService service, String namespacesString) throws XMLDBException {
-        if ((namespacesString != "") && (namespacesString != null)) {
+        if ((namespacesString != null) && (namespacesString.length() > 0)) {
             StringTokenizer st = new StringTokenizer(namespacesString, "=;");
             if (st.countTokens() % 2 != 0) {
                 throw new XMLDBException(0, "mismatched namespace prefixes and uris in '" + namespacesString + "'");
Index: java/src/org/apache/xindice/tools/command/XUpdate.java
===================================================================
RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/tools/command/XUpdate.java,v
retrieving revision 1.5
diff -u -r1.5 XUpdate.java
--- java/src/org/apache/xindice/tools/command/XUpdate.java	8 Feb 2004 02:57:35 -0000	1.5
+++ java/src/org/apache/xindice/tools/command/XUpdate.java	13 Jul 2004 19:25:55 -0000
@@ -53,7 +53,7 @@
                 return false;
             }
 
-            if ((String) table.get(XMLTools.FILE_PATH) == "") {
+            if (((String) table.get(XMLTools.FILE_PATH)).length() == 0) {
                 System.out.println("ERROR : Path to file containing XUpdate to execute required");
                 return false;
             }