Browse Source

Use refelection to completely decouple Native2Ascii from Sun's implementation

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277566 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 20 years ago
parent
commit
ab0d0f78f4
2 changed files with 20 additions and 3 deletions
  1. +0
    -1
      build.xml
  2. +20
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java

+ 0
- 1
build.xml View File

@@ -163,7 +163,6 @@
<selector id="needs.sun.tools">
<or>
<filename name="${optional.package}/Javah*"/>
<filename name="${optional.package}/native2ascii/Sun*"/>
</or>
</selector>



+ 20
- 2
src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java View File

@@ -16,6 +16,7 @@
*/
package org.apache.tools.ant.taskdefs.optional.native2ascii;

import java.lang.reflect.Method;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
@@ -43,7 +44,24 @@ public final class SunNative2Ascii extends DefaultNative2Ascii {

protected boolean run(Commandline cmd, ProjectComponent log)
throws BuildException {
sun.tools.native2ascii.Main n2a = new sun.tools.native2ascii.Main();
return n2a.convert(cmd.getArguments());
try {
Class n2aMain = Class.forName("sun.tools.native2ascii.Main");
Class[] param = new Class[] {String[].class};
Method convert = n2aMain.getMethod("convert", param);
if (convert == null) {
throw new BuildException("Could not find convert() method in "
+ "sun.tools.native2ascii.Main");
}
Object o = n2aMain.newInstance();
return ((Boolean) convert.invoke(o,
new Object[] {cmd.getArguments()})
).booleanValue();
} catch (BuildException ex) {
//rethrow
throw ex;
} catch (Exception ex) {
//wrap
throw new BuildException("Error starting Sun's native2ascii: ", ex);
}
}
}

Loading…
Cancel
Save