[izpack-changes] izpack-src/src/lib/com/coi/tools/os/win NativeLibException.java,1.4,1.5 RegDataContainer.java,1.4,1.5 RegistryImpl.java,1.8,1.9

[jponge]

Update of /cvsroot/izpack/izpack-src/src/lib/com/coi/tools/os/win
In directory sheep:/tmp/cvs-serv3622/src/lib/com/coi/tools/os/win

Modified Files:
	NativeLibException.java RegDataContainer.java 
	RegistryImpl.java 
Log Message:
Some fixes adviced by IntelliJ IDEA 5.1 code inspector.

Index: NativeLibException.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/coi/tools/os/win/NativeLibException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NativeLibException.java	12 Mar 2006 16:32:13 -0000	1.4
+++ NativeLibException.java	21 Mar 2006 18:14:42 -0000	1.5
@@ -87,7 +87,6 @@
             mre.printStackTrace();
         }
         messageResourceBundles.put(bundlePath, bd);
-        return;
 
     }
 

Index: RegDataContainer.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/coi/tools/os/win/RegDataContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RegDataContainer.java	12 Mar 2006 16:32:13 -0000	1.4
+++ RegDataContainer.java	21 Mar 2006 18:14:42 -0000	1.5
@@ -344,4 +344,12 @@
         return (false);
     }
 
+    public int hashCode()
+    {
+        int result;
+        result = (int) (dwordData ^ (dwordData >>> 32));
+        result = 29 * result + (stringData != null ? stringData.hashCode() : 0);
+        result = 29 * result + type;
+        return result;
+    }
 }

Index: RegistryImpl.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/coi/tools/os/win/RegistryImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- RegistryImpl.java	12 Mar 2006 16:32:13 -0000	1.8
+++ RegistryImpl.java	21 Mar 2006 18:14:42 -0000	1.9
@@ -206,7 +206,7 @@
         catch (NativeLibException ne)
         {
             String em = ne.getLibMessage();
-            if (em.equals("functionFailed.RegOpenKeyEx")) { return (false); }
+            if ("functionFailed.RegOpenKeyEx".equals(em)) { return (false); }
             throw (ne);
         }
     }
@@ -228,8 +228,8 @@
         catch (NativeLibException ne)
         {
             String em = ne.getLibMessage();
-            if (em.equals("functionFailed.RegOpenKeyEx")
-                    || em.equals("functionFailed.RegQueryValueEx")) { return (false); }
+            if ("functionFailed.RegOpenKeyEx".equals(em)
+                    || "functionFailed.RegQueryValueEx".equals(em)) { return (false); }
             throw (ne);
         }
         return (true);
@@ -338,8 +338,8 @@
             catch (NativeLibException ne)
             {
                 String em = ne.getLibMessage();
-                if (em.equals("functionFailed.RegOpenKeyEx")
-                        || em.equals("functionFailed.RegQueryValueEx"))
+                if ("functionFailed.RegOpenKeyEx".equals(em)
+                        || "functionFailed.RegQueryValueEx".equals(em))
                 {
                     setValueR(root, key, value, contents);
                     return;
@@ -357,7 +357,6 @@
                     localValue, contents, oldContents);
             log(rli);
         }
-        return;
     }
 
     /**