[commons-daemon] branch master updated: Fix Generics warnings for Java 6 source level

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new 62ea525  Fix Generics warnings for Java 6 source level
62ea525 is described below

commit 62ea525740fa79b053e7554823c34f8ad1a0b425
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 2 10:42:47 2019 +0100

    Fix Generics warnings for Java 6 source level
---
 src/samples/AloneService.java      | 2 +-
 src/samples/ProcrunService.java    | 4 ++--
 src/samples/ServiceDaemon.java     | 2 +-
 src/samples/SimpleApplication.java | 8 ++++----
 src/samples/SimpleDaemon.java      | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/samples/AloneService.java b/src/samples/AloneService.java
index a3c4c67..1f5c086 100644
--- a/src/samples/AloneService.java
+++ b/src/samples/AloneService.java
@@ -77,7 +77,7 @@ public class AloneService {
 
         /* Start */
         int i=0;
-        for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+        for (Enumeration<Object> e = prop.keys(); e.hasMoreElements() ;) {
            String name = (String) e.nextElement();
            System.err.println("ServiceDaemon: starting: " + name + " : " + 
prop.getProperty(name));
            try {
diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java
index b944460..a84f299 100644
--- a/src/samples/ProcrunService.java
+++ b/src/samples/ProcrunService.java
@@ -103,8 +103,8 @@ public class ProcrunService implements Runnable {
 
         log("System properties: ");
         Properties ps = System.getProperties();
-        TreeSet    ts = new TreeSet(ps.keySet());
-        for (Iterator i = ts.iterator(); i.hasNext();) {
+        TreeSet<Object> ts = new TreeSet<Object>(ps.keySet());
+        for (Iterator<Object> i = ts.iterator(); i.hasNext();) {
             String n = (String)i.next();
             log(n + " ->  " + ps.get(n));
         }
diff --git a/src/samples/ServiceDaemon.java b/src/samples/ServiceDaemon.java
index 7cf9b4b..1ded4a6 100644
--- a/src/samples/ServiceDaemon.java
+++ b/src/samples/ServiceDaemon.java
@@ -84,7 +84,7 @@ public class ServiceDaemon implements Daemon {
 
         /* Start */
         int i=0;
-        for (Enumeration e = prop.keys(); e.hasMoreElements() ;) {
+        for (Enumeration<Object> e = prop.keys(); e.hasMoreElements() ;) {
             String name = (String) e.nextElement();
             System.err.println("ServiceDaemon: starting: " + name + " : " + 
prop.getProperty(name));
             try {
diff --git a/src/samples/SimpleApplication.java 
b/src/samples/SimpleApplication.java
index 3753b31..91bab1e 100644
--- a/src/samples/SimpleApplication.java
+++ b/src/samples/SimpleApplication.java
@@ -35,7 +35,7 @@ public class SimpleApplication implements Runnable {
     private Thread thread=null;
     private volatile boolean stopping=false;
     private String directory=null;
-    private final Vector handlers;
+    private final Vector<Handler> handlers;
 
     public static native void toto();
 
@@ -44,7 +44,7 @@ public class SimpleApplication implements Runnable {
         super();
         System.err.println("SimpleApplication: instance "+this.hashCode()+
                            " created");
-        this.handlers=new Vector();
+        this.handlers = new Vector<Handler>();
     }
 
     protected void finalize() {
@@ -134,9 +134,9 @@ public class SimpleApplication implements Runnable {
         }
 
         /* Terminate all handlers that at this point are still open */
-        Enumeration openhandlers=this.handlers.elements();
+        Enumeration<Handler> openhandlers = this.handlers.elements();
         while (openhandlers.hasMoreElements()) {
-            Handler handler=(Handler)openhandlers.nextElement();
+            Handler handler = openhandlers.nextElement();
             System.err.println("SimpleApplication: dropping connection "+
                                handler.getConnectionNumber());
             handler.close();
diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java
index cecccff..7752241 100644
--- a/src/samples/SimpleDaemon.java
+++ b/src/samples/SimpleDaemon.java
@@ -41,7 +41,7 @@ public class SimpleDaemon implements Daemon, Runnable {
     private DaemonController controller=null;
     private volatile boolean stopping=false;
     private String directory=null;
-    private final Vector handlers;
+    private final Vector<Handler> handlers;
 
     public static native void toto();
 
@@ -49,7 +49,7 @@ public class SimpleDaemon implements Daemon, Runnable {
         super();
         System.err.println("SimpleDaemon: instance "+this.hashCode()+
                            " created");
-        this.handlers=new Vector();
+        this.handlers = new Vector<Handler>();
     }
 
     protected void finalize() {
@@ -133,9 +133,9 @@ public class SimpleDaemon implements Daemon, Runnable {
         }
 
         /* Terminate all handlers that at this point are still open */
-        Enumeration openhandlers=this.handlers.elements();
+        Enumeration<Handler> openhandlers = this.handlers.elements();
         while (openhandlers.hasMoreElements()) {
-            Handler handler=(Handler)openhandlers.nextElement();
+            Handler handler = openhandlers.nextElement();
             System.err.println("SimpleDaemon: dropping connection "+
                                handler.getConnectionNumber());
             handler.close();