diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 1a5b5912a..6433c7670 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -518,7 +518,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { if (cons.length > 0 && cons[0] != null) { final String[] strs = new String[NUMBER_OF_STRINGS]; try { - cons[0].newInstance(strs); + cons[0].newInstance((Object[])strs); // Expecting an exception to be thrown by this call: // IllegalArgumentException: wrong number of Arguments } catch (Throwable t) { diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index f8e1597c4..2c2702514 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -295,7 +295,7 @@ public class ComponentHelper { throw new BuildException(message); } try { - taskClass.getConstructor(null); + taskClass.getConstructor((Class[])null); // don't have to check for public, since // getConstructor finds public constructors only. } catch (NoSuchMethodException e) { diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index 93a4a5360..abd4ac08b 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -131,11 +131,11 @@ public final class Diagnostics { try { // Package pkg = clazz.getPackage(); Method method = Class.class.getMethod("getPackage", new Class[0]); - Object pkg = method.invoke(clazz, null); + Object pkg = method.invoke(clazz, (Object[])null); if (pkg != null) { // pkg.getImplementationVersion(); method = pkg.getClass().getMethod("getImplementationVersion", new Class[0]); - Object version = method.invoke(pkg, null); + Object version = method.invoke(pkg, (Object[])null); return (String) version; } } catch (Exception e) { diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 96be1cfbe..e163c898e 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -540,7 +540,7 @@ public final class IntrospectionHelper implements BuildListener { } } try { - addText.invoke(element, new String[] {text}); + addText.invoke(element, new Object[] {text}); } catch (IllegalAccessException ie) { // impossible as getMethods should only return public methods throw new BuildException(ie); @@ -1050,7 +1050,7 @@ public final class IntrospectionHelper implements BuildListener { return new AttributeSetter(m) { public void set(Project p, Object parent, String value) throws InvocationTargetException, IllegalAccessException { - m.invoke(parent, new String[] {value}); + m.invoke(parent, (Object[])(new String[] {value})); } }; @@ -1064,7 +1064,8 @@ public final class IntrospectionHelper implements BuildListener { + "legal value for attribute \"" + attrName + "\""); } - m.invoke(parent, new Character[] {new Character(value.charAt(0))}); + m.invoke(parent, (Object[]) + (new Character[] {new Character(value.charAt(0))})); } }; @@ -1074,9 +1075,9 @@ public final class IntrospectionHelper implements BuildListener { return new AttributeSetter(m) { public void set(Project p, Object parent, String value) throws InvocationTargetException, IllegalAccessException { - m.invoke(parent, + m.invoke(parent,(Object[])( new Boolean[] {Project.toBoolean(value) - ? Boolean.TRUE : Boolean.FALSE}); + ? Boolean.TRUE : Boolean.FALSE})); } }; @@ -1087,7 +1088,7 @@ public final class IntrospectionHelper implements BuildListener { public void set(Project p, Object parent, String value) throws InvocationTargetException, IllegalAccessException, BuildException { try { - m.invoke(parent, new Class[] {Class.forName(value)}); + m.invoke(parent, new Object[] {Class.forName(value)}); } catch (ClassNotFoundException ce) { throw new BuildException(ce); } @@ -1099,7 +1100,7 @@ public final class IntrospectionHelper implements BuildListener { return new AttributeSetter(m) { public void set(Project p, Object parent, String value) throws InvocationTargetException, IllegalAccessException { - m.invoke(parent, new File[] {p.resolveFile(value)}); + m.invoke(parent, new Object[] {p.resolveFile(value)}); } }; @@ -1113,7 +1114,7 @@ public final class IntrospectionHelper implements BuildListener { EnumeratedAttribute ea = (EnumeratedAttribute) reflectedArg.newInstance(); ea.setValue(value); - m.invoke(parent, new EnumeratedAttribute[] {ea}); + m.invoke(parent, new Object[] {ea}); } catch (InstantiationException ie) { throw new BuildException(ie); } diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index af621222d..d2b480482 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -888,7 +888,7 @@ public class Project { throw new BuildException(message); } try { - taskClass.getConstructor(null); + taskClass.getConstructor((Class[])null); // don't have to check for public, since // getConstructor finds public constructors only. } catch (NoSuchMethodException e) { diff --git a/src/main/org/apache/tools/ant/TaskAdapter.java b/src/main/org/apache/tools/ant/TaskAdapter.java index cc005e2e3..f7bc89651 100644 --- a/src/main/org/apache/tools/ant/TaskAdapter.java +++ b/src/main/org/apache/tools/ant/TaskAdapter.java @@ -59,7 +59,7 @@ public class TaskAdapter extends Task implements TypeAdapter { // don't have to check for interface, since then // taskClass would be abstract too. try { - final Method executeM = taskClass.getMethod("execute", null); + final Method executeM = taskClass.getMethod("execute", (Class[])null); // don't have to check for public, since // getMethod finds public method only. // don't have to check for abstract, since then diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java index c2488d59e..e10d9bc9e 100644 --- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java +++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java @@ -55,7 +55,7 @@ public class DispatchUtils { final Class c = dispatchable.getClass(); final Method actionM = c.getMethod(mName, new Class[0]); if (actionM != null) { - final Object o = actionM.invoke(dispatchable, null); + final Object o = actionM.invoke(dispatchable, (Object[])null); if (o != null) { final String s = o.toString(); if (s != null && s.trim().length() > 0) { @@ -66,7 +66,7 @@ public class DispatchUtils { throw new BuildException("No public " + methodName + "() in " + dispatchable.getClass()); } - executeM.invoke(dispatchable, null); + executeM.invoke(dispatchable, (Object[])null); if (task instanceof UnknownElement) { ((UnknownElement) task).setRealThing(null); } @@ -92,7 +92,7 @@ public class DispatchUtils { throw new BuildException("No public " + methodName + "() in " + task.getClass()); } - executeM.invoke(task, null); + executeM.invoke(task, (Object[])null); if (task instanceof UnknownElement) { ((UnknownElement) task).setRealThing(null); } diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java index c690c1ac6..79e3fa44a 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java @@ -175,7 +175,7 @@ public final class ChainReaderHelper { } final Reader[] rdr = {instream}; instream = - (Reader) constructors[j].newInstance(rdr); + (Reader) constructors[j].newInstance((Object[])rdr); setProjectOnObject(instream); if (Parameterizable.class.isAssignableFrom(clazz)) { final Parameter[] params = filter.getParams(); diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java index f4f28f6e4..c292470ef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java @@ -45,8 +45,8 @@ public class KaffeRmic extends DefaultRmicAdapter { Class c = Class.forName(RMIC_CLASSNAME); Constructor cons = c.getConstructor(new Class[] {String[].class}); Object rmic = cons.newInstance(new Object[] {cmd.getArguments()}); - Method doRmic = c.getMethod("run", null); - Boolean ok = (Boolean) doRmic.invoke(rmic, null); + Method doRmic = c.getMethod("run", (Class[]) null); + Boolean ok = (Boolean) doRmic.invoke(rmic, (Object[])null); return ok.booleanValue(); } catch (ClassNotFoundException ex) { diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index a023c93ca..cea728230 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/src/main/org/apache/tools/zip/ZipEntry.java @@ -423,7 +423,7 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable { private static void performSetCompressedSize(ZipEntry ze, long size) { Long[] s = {new Long(size)}; try { - setCompressedSizeMethod.invoke(ze, s); + setCompressedSizeMethod.invoke(ze, (Object[])s); } catch (InvocationTargetException ite) { Throwable nested = ite.getTargetException(); throw new RuntimeException("Exception setting the compressed size "