[izpack-changes] izpack-src/src/lib/net/n3/nanoxml NonValidator.java,1.7,1.8 StdXMLParser.java,1.8,1.9 StdXMLReader.java,1.9,1.10

[jponge]

Update of /cvsroot/izpack/izpack-src/src/lib/net/n3/nanoxml
In directory sheep:/tmp/cvs-serv3622/src/lib/net/n3/nanoxml

Modified Files:
	NonValidator.java StdXMLParser.java StdXMLReader.java 
Log Message:
Some fixes adviced by IntelliJ IDEA 5.1 code inspector.

Index: NonValidator.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/net/n3/nanoxml/NonValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- NonValidator.java	12 Mar 2006 16:32:29 -0000	1.7
+++ NonValidator.java	21 Mar 2006 18:14:55 -0000	1.8
@@ -362,7 +362,7 @@
                 String str = XMLUtil.scanIdentifier(reader, '%', this.parameterEntityResolver);
                 XMLUtil.skipWhitespace(reader, '%', null, null);
 
-                if (!str.equals("FIXED"))
+                if (!"FIXED".equals(str))
                 {
                     XMLUtil.skipWhitespace(reader, '%', null, null);
                     ch = XMLUtil.read(reader, null, '%', this.parameterEntityResolver);

Index: StdXMLParser.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/net/n3/nanoxml/StdXMLParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StdXMLParser.java	12 Mar 2006 16:32:30 -0000	1.8
+++ StdXMLParser.java	21 Mar 2006 18:14:55 -0000	1.9
@@ -275,7 +275,7 @@
         Reader reader = new ContentReader(this.reader, this.entityResolver, '&',
                 StdXMLParser.END_OF_PI, true, "");
 
-        if (!target.equalsIgnoreCase("xml"))
+        if (!"xml".equalsIgnoreCase(target))
         {
             this.builder.newProcessingInstruction(target, reader);
         }
@@ -314,7 +314,6 @@
 
         case '-':
             XMLUtil.skipComment(this.reader, this.entityResolver);
-            return;
         }
     }
 

Index: StdXMLReader.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/net/n3/nanoxml/StdXMLReader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- StdXMLReader.java	12 Mar 2006 16:32:30 -0000	1.9
+++ StdXMLReader.java	21 Mar 2006 18:14:55 -0000	1.10
@@ -264,7 +264,7 @@
                 break;
             }
 
-            if (key.toString().equals("encoding")) { return str.substring(index, index2); }
+            if ("encoding".equals(key.toString())) { return str.substring(index, index2); }
 
             index = index2 + 1;
         }