diff options
Diffstat (limited to 'bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt')
2 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java index 3c22defa58..08566a490b 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java @@ -25,7 +25,7 @@ public class ASTMethod extends ASTItem implements JNIMethod { ASTClass declaringClass; ASTType[] paramTypes, paramTypes64; ASTType returnType, returnType64; - ASTParameter[] params; + ASTParameter[] parameters; Boolean unique; String data; @@ -65,13 +65,13 @@ public ASTMethod(ASTClass declaringClass, String source, MethodDeclaration metho List parameters = method.parameters(); paramTypes = new ASTType[parameters.size()]; paramTypes64 = new ASTType[parameters.size()]; - params = new ASTParameter[paramTypes.length]; + this.parameters = new ASTParameter[paramTypes.length]; int i = 0; for (Iterator iterator = parameters.iterator(); iterator.hasNext(); i++) { SingleVariableDeclaration param = (SingleVariableDeclaration) iterator.next(); paramTypes[i] = new ASTType(declaringClass.resolver, param.getType(), param.getExtraDimensions()); paramTypes64[i] = paramTypes[i]; - params[i] = new ASTParameter(this, i); + this.parameters[i] = new ASTParameter(this, i); if (GEN64) { String s = source.substring(param.getStartPosition(), param.getStartPosition() + param.getLength()); if (paramTypes[i].isType("int") && s.indexOf("int /*long*/") != -1) paramTypes64[i] = new ASTType("J"); @@ -91,7 +91,7 @@ public ASTMethod(ASTClass declaringClass, String source, MethodDeclaration metho List fragments = tag.fragments(); if (name.equals(fragments.get(0).toString())) { String data = fragments.get(1).toString(); - params[i].setMetaData(data); + this.parameters[i].setMetaData(data); } } } @@ -139,7 +139,7 @@ public JNIType[] getParameterTypes64() { } public JNIParameter[] getParameters() { - return params; + return this.parameters; } public JNIType getReturnType() { diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java index f8e4e6675f..2d7e590082 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java @@ -346,7 +346,7 @@ public JNIClass[] getASTClasses() { if (classes != null) return classes; if (mainClassName == null) return new JNIClass[0]; String root = new File(outputDir).getParent(); - String mainPath = root + "/" + mainClassName.replace('.', '/') + ".java"; + String mainPath = new File(root + "/" + mainClassName.replace('.', '/') + ".java").getAbsolutePath(); ArrayList classes = new ArrayList(); String packageName = getPackageName(mainClassName); File dir = new File(root + "/" + packageName.replace('.', '/')); |