[izpack-changes] izpack-src/src/lib/com/izforge/izpack ExecutableFile.java,1.10,1.11 Info.java,1.27,1.28 LocaleDatabase.java,1.21,1.22 Pack.java,1.27,1.28 UpdateCheck.java,1.4,1.5

[jponge]

Update of /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack
In directory sheep:/tmp/cvs-serv3622/src/lib/com/izforge/izpack

Modified Files:
	ExecutableFile.java Info.java LocaleDatabase.java Pack.java 
	UpdateCheck.java 
Log Message:
Some fixes adviced by IntelliJ IDEA 5.1 code inspector.

Index: ExecutableFile.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/ExecutableFile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ExecutableFile.java	12 Mar 2006 16:32:14 -0000	1.10
+++ ExecutableFile.java	21 Mar 2006 18:14:53 -0000	1.11
@@ -130,38 +130,38 @@
     public String toString()
     {
         StringBuffer retval = new StringBuffer();
-        retval.append("path = " + path);
+        retval.append("path = ").append(path);
         retval.append("\n");
-        retval.append("mainClass = " + mainClass);
+        retval.append("mainClass = ").append(mainClass);
         retval.append("\n");
-        retval.append("type = " + type);
+        retval.append("type = ").append(type);
         retval.append("\n");
-        retval.append("executionStage = " + executionStage);
+        retval.append("executionStage = ").append(executionStage);
         retval.append("\n");
-        retval.append("onFailure = " + onFailure);
+        retval.append("onFailure = ").append(onFailure);
         retval.append("\n");
-        retval.append("argList: " + argList);
+        retval.append("argList: ").append(argList);
         retval.append("\n");
         if (argList != null)
         {
             for (int i = 0; i < argList.size(); i++)
             {
-                retval.append("\targ: " + argList.get(i));
+                retval.append("\targ: ").append(argList.get(i));
                 retval.append("\n");
             }
         }
         retval.append("\n");
-        retval.append("osList = " + osList);
+        retval.append("osList = ").append(osList);
         retval.append("\n");
         if (osList != null)
         {
             for (int i = 0; i < osList.size(); i++)
             {
-                retval.append("\tos: " + osList.get(i));
+                retval.append("\tos: ").append(osList.get(i));
                 retval.append("\n");
             }
         }
-        retval.append("keepFile = " + keepFile);
+        retval.append("keepFile = ").append(keepFile);
         retval.append("\n");
         return retval.toString();
     }

Index: Info.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/Info.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Info.java	12 Mar 2006 16:32:14 -0000	1.27
+++ Info.java	21 Mar 2006 18:14:53 -0000	1.28
@@ -34,7 +34,8 @@
     static final long serialVersionUID = 13288410782044775L;
 
     /** The application name and version */
-    private String appName = "", appVersion = "";
+    private String appName = "";
+    private String appVersion = "";
 
     /** The installation subpath */
     private String installationSubPath = null;

Index: LocaleDatabase.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/LocaleDatabase.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- LocaleDatabase.java	12 Mar 2006 16:32:14 -0000	1.21
+++ LocaleDatabase.java	21 Mar 2006 18:14:53 -0000	1.22
@@ -64,7 +64,7 @@
         XMLElement data = (XMLElement) parser.parse();
 
         // We check the data
-        if (!data.getName().equalsIgnoreCase("langpack"))
+        if (!"langpack".equalsIgnoreCase(data.getName()))
             throw new Exception("this is not an IzPack XML langpack file");
 
         // We fill the Hashtable
@@ -74,7 +74,7 @@
         {
             XMLElement e = (XMLElement) children.get(i);
             String text = e.getContent();
-            if (text != null && !text.equals(""))
+            if (text != null && !"".equals(text))
             {
                 put(e.getAttribute("id"), text.trim());
             }

Index: Pack.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/Pack.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Pack.java	12 Mar 2006 16:32:14 -0000	1.27
+++ Pack.java	21 Mar 2006 18:14:53 -0000	1.28
@@ -153,7 +153,7 @@
     {
         String text = "";
         if (dependencies == null) return text;
-        String name = null;
+        String name;
         for (int i = 0; i < dependencies.size() - 1; i++)
         {
             name = (String) dependencies.get(i);

Index: UpdateCheck.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/UpdateCheck.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- UpdateCheck.java	12 Mar 2006 16:32:14 -0000	1.4
+++ UpdateCheck.java	21 Mar 2006 18:14:53 -0000	1.5
@@ -75,7 +75,7 @@
     {
         this.includesList = includes;
         this.excludesList = excludes;
-        this.caseSensitive = ((casesensitive != null) && casesensitive.equalsIgnoreCase("yes"));
+        this.caseSensitive = ((casesensitive != null) && "yes".equalsIgnoreCase(casesensitive));
     }
 
 }