Author: markt
Date: Thu Nov 3 11:48:13 2016
New Revision: 1767874
URL: http://svn.apache.org/viewvc?rev=1767874&view=rev
Log:
Java 5 fixes (<> and @Override)
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/DaemonPermission.java
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
commons/proper/daemon/trunk/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/DaemonPermission.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/DaemonPermission.java?rev=1767874&r1=1767873&r2=1767874&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/DaemonPermission.java
(original)
+++
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/DaemonPermission.java
Thu Nov 3 11:48:13 2016
@@ -242,6 +242,7 @@ public final class DaemonPermission exte
*
* @return The canonicalized list of actions.
*/
+ @Override
public String getActions()
{
if (this.type == TYPE_CONTROL) {
@@ -255,6 +256,7 @@ public final class DaemonPermission exte
*
* @return An hash code value.
*/
+ @Override
public int hashCode()
{
this.setupDescription();
@@ -267,6 +269,7 @@ public final class DaemonPermission exte
* @return <b>true</b> or <b>false</b> wether the specified object equals
* this <code>DaemonPermission</code> instance or not.
*/
+ @Override
public boolean equals(Object object)
{
if (object == this) {
@@ -293,6 +296,7 @@ public final class DaemonPermission exte
* is implied by this <code>DaemonPermission</code> instance or
* not.
*/
+ @Override
public boolean implies(Permission permission)
{
if (permission == this) {
@@ -317,6 +321,7 @@ public final class DaemonPermission exte
* @return A <code>String</code> representing this
* <code>DaemonPermission</code> instance.
*/
+ @Override
public String toString()
{
this.setupDescription();
@@ -327,7 +332,7 @@ public final class DaemonPermission exte
* Private methods
*/
- /**
+ /**
* Creates a String description for this permission instance.
*/
private void setupDescription()
@@ -354,7 +359,7 @@ public final class DaemonPermission exte
this.desc = buf.toString();
}
- /**
+ /**
* Creates a permission mask for a given control actions string.
*/
private int createControlMask(String actions)
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java?rev=1767874&r1=1767873&r2=1767874&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
(original)
+++
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
Thu Nov 3 11:48:13 2016
@@ -158,7 +158,7 @@ public final class DaemonConfiguration
/**
* Gets the configuration property.
- *
+ *
* @param name The name of the property to get.
*
* @throws ParseException if the property is wrongly formatted.
@@ -190,7 +190,7 @@ public final class DaemonConfiguration
public String[] getPropertyArray(String name)
throws ParseException
{
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
String args;
// Load daemon.arg[0] ... daemon.arg[n] into the String array.
@@ -198,8 +198,7 @@ public final class DaemonConfiguration
while ((args = getProperty(name + "[" + list.size() + "]")) != null) {
list.add(args);
}
- return (String[])list.toArray(new String[list.size()]);
+ return list.toArray(new String[list.size()]);
}
-
}
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java?rev=1767874&r1=1767873&r2=1767874&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
(original)
+++
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
Thu Nov 3 11:48:13 2016
@@ -77,7 +77,7 @@ public final class DaemonLoader
}
/* Find the required class */
- Class c = cl.loadClass(cn);
+ Class<?> c = cl.loadClass(cn);
/* This should _never_ happen, but doublechecking doesn't harm */
if (c == null) {
@@ -137,7 +137,7 @@ public final class DaemonLoader
System.err.println("Cannot retrieve ClassLoader instance");
return false;
}
- Class c;
+ Class<?> c;
if (className.charAt(0) == '@') {
/* Wrapp the class with DaemonWrapper
* and modify arguments to include the real class name.
@@ -160,8 +160,7 @@ public final class DaemonLoader
boolean isdaemon = false;
try {
- Class dclass =
- cl.loadClass("org.apache.commons.daemon.Daemon");
+ Class<?> dclass =
cl.loadClass("org.apache.commons.daemon.Daemon");
isdaemon = dclass.isAssignableFrom(c);
}
catch (Exception cnfex) {
@@ -169,7 +168,7 @@ public final class DaemonLoader
}
/* Check methods */
- Class[] myclass = new Class[1];
+ Class<?>[] myclass = new Class[1];
if (isdaemon) {
myclass[0] = DaemonContext.class;
}
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java?rev=1767874&r1=1767873&r2=1767874&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
(original)
+++
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
Thu Nov 3 11:48:13 2016
@@ -196,7 +196,7 @@ public class DaemonWrapper implements Da
private String call = null;
private String[] args = null;
private Method inst = null;
- private Class main = null;
+ private Class<?> main = null;
protected Invoker()
{
@@ -217,12 +217,12 @@ public class DaemonWrapper implements Da
protected void addArguments(String[] args)
{
if (args != null) {
- ArrayList aa = new ArrayList();
+ ArrayList<String> aa = new ArrayList<String>();
if (this.args != null) {
aa.addAll(Arrays.asList(this.args));
}
aa.addAll(Arrays.asList(args));
- this.args = (String[])aa.toArray(new String[aa.size()]);
+ this.args = aa.toArray(new String[aa.size()]);
}
}
@@ -269,7 +269,7 @@ public class DaemonWrapper implements Da
if (cl == null) {
throw new NullPointerException("Cannot retrieve ClassLoader
instance");
}
- Class[] ca = new Class[1];
+ Class<?>[] ca = new Class[1];
ca[0] = args.getClass();
// Find the required class
main = cl.loadClass(name);
Modified:
commons/proper/daemon/trunk/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/test/java/org/apache/commons/daemon/SimpleDaemon.java?rev=1767874&r1=1767873&r2=1767874&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
(original)
+++
commons/proper/daemon/trunk/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
Thu Nov 3 11:48:13 2016
@@ -28,7 +28,7 @@ import org.apache.commons.daemon.DaemonC
import org.apache.commons.daemon.DaemonContext;
/**
- * @version $Id$
+ * @version $Id$
*/
public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
@@ -37,16 +37,17 @@ public class SimpleDaemon implements Dae
private DaemonController controller=null;
private volatile boolean stopping=false;
private String directory=null;
- private Vector handlers=null;
+ private Vector<Handler> handlers=null;
private boolean softReloadSignalled;
public SimpleDaemon() {
super();
System.err.println("SimpleDaemon: instance "+this.hashCode()+
" created");
- this.handlers=new Vector();
+ this.handlers=new Vector<Handler>();
}
+ @Override
protected void finalize() {
System.err.println("SimpleDaemon: instance "+this.hashCode()+
" garbage collected");
@@ -126,9 +127,9 @@ public class SimpleDaemon implements Dae
}
/* 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();
