Added generics (part 4).

This patch brings down the warnings from 3427 to 2917.

Ticket #2

2 files changed, 14 insertions, 15 deletions

diff --git a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java
index 3fdcb0245..f01e1e1c3 100644
--- a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java
+++ b/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java
@@ -37,17 +37,17 @@ public class OldJoinShares implements IJoinShares {
     }
 
     public void initialize(int threshold) throws Exception {
-        Class c = Class.forName("com.netscape.cmscore.shares.JoinShares");
-        Class types[] = { int.class };
-        Constructor con = c.getConstructor(types);
+        Class<?> c = Class.forName("com.netscape.cmscore.shares.JoinShares");
+        Class<?> types[] = { int.class };
+        Constructor<?> con = c.getConstructor(types);
         Object params[] = { Integer.valueOf(threshold) };
         mOldImpl = con.newInstance(params);
     }
 
     public void addShare(int shareNum, byte[] share) {
         try {
-            Class types[] = { int.class, share.getClass() };
-            Class c = mOldImpl.getClass();
+            Class<?> types[] = { int.class, share.getClass() };
+            Class<?> c = mOldImpl.getClass();
             Method method = c.getMethod("addShare", types);
             Object params[] = { Integer.valueOf(shareNum), share };
             method.invoke(mOldImpl, params);
@@ -59,8 +59,8 @@ public class OldJoinShares implements IJoinShares {
         if (mOldImpl == null)
             return -1;
         try {
-            Class types[] = null;
-            Class c = mOldImpl.getClass();
+            Class<?> types[] = null;
+            Class<?> c = mOldImpl.getClass();
             Method method = c.getMethod("getShareCount", types);
             Object params[] = null;
             Integer result = (Integer) method.invoke(mOldImpl, params);
@@ -74,8 +74,8 @@ public class OldJoinShares implements IJoinShares {
         if (mOldImpl == null)
             return null;
         try {
-            Class types[] = null;
-            Class c = mOldImpl.getClass();
+            Class<?> types[] = null;
+            Class<?> c = mOldImpl.getClass();
             Method method = c.getMethod("recoverSecret", types);
             Object params[] = null;
             return (byte[]) method.invoke(mOldImpl, params);
diff --git a/pki/base/common/src/com/netscape/cms/shares/OldShare.java b/pki/base/common/src/com/netscape/cms/shares/OldShare.java
index a867fcbff..4020e759e 100644
--- a/pki/base/common/src/com/netscape/cms/shares/OldShare.java
+++ b/pki/base/common/src/com/netscape/cms/shares/OldShare.java
@@ -37,10 +37,9 @@ public class OldShare implements IShare {
 
     public void initialize(byte[] secret, int threshold) throws Exception {
         try {
-            Class c = Class.forName("com.netscape.cmscore.shares.Share");
-            Class types[] = { secret.getClass(), int.class };
-            Constructor cs[] = c.getConstructors();
-            Constructor con = c.getConstructor(types);
+            Class<?> c = Class.forName("com.netscape.cmscore.shares.Share");
+            Class<?> types[] = { secret.getClass(), int.class };
+            Constructor<?> con = c.getConstructor(types);
             Object params[] = { secret, Integer.valueOf(threshold) };
             mOldImpl = con.newInstance(params);
         } catch (Exception e) {
@@ -51,8 +50,8 @@ public class OldShare implements IShare {
         if (mOldImpl == null)
             return null;
         try {
-            Class types[] = { int.class };
-            Class c = mOldImpl.getClass();
+            Class<?> types[] = { int.class };
+            Class<?> c = mOldImpl.getClass();
             Method method = c.getMethod("createShare", types);
             Object params[] = { Integer.valueOf(sharenumber) };
             return (byte[]) method.invoke(mOldImpl, params);