Adjust refactoring for JLS8: avoid unsupported method (ext.dims).
+ use generics to avoid warnings
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTNodeCreator.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTNodeCreator.java
index e17bcca..46bf3f9 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTNodeCreator.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTNodeCreator.java
@@ -284,27 +284,6 @@
newFieldAcc.setSignatureFlag(true);
return newFieldAcc;
}
- public static MethodSpec createMethodSpec(AST ast, String methodName, String returnType, List<String> argumentNames, List<String> argumentTypes, List<Integer> dimensions, boolean signatureFlag)
- {
- MethodSpec methodSpec = ast.newMethodSpec();
- methodSpec.setName(ast.newSimpleName(methodName));
- methodSpec.setReturnType2(createType(ast, returnType));
- methodSpec.setSignatureFlag(signatureFlag);
-
- if (argumentTypes !=null && argumentTypes.size()!=0)
- {
- List<VariableDeclaration> methodParameters = methodSpec.parameters();
- for (int idx = 0; idx < argumentTypes.size(); idx++)
- {
- String argumentName = (argumentNames != null)
- ? argumentNames.get(idx)
- : "arg"+idx; //$NON-NLS-1$
- VariableDeclaration tmp = createArgument(ast, 0, createType(ast, argumentTypes.get(idx)), argumentName, dimensions.get(idx), null);
- methodParameters.add(tmp);
- }
- }
- return methodSpec;
- }
public static MethodSpec createMethodSpec(AST ast, String methodName, Type returnType, List parameters, boolean signatureFlag)
{
@@ -393,19 +372,13 @@
return null;
}
- @SuppressWarnings("deprecation")
- public static SingleVariableDeclaration createArgument(AST ast, int modifier, Type parameterType, String parameterName, int dimension,
- Expression initializer)
+ public static SingleVariableDeclaration createArgument(AST ast, int modifier, Type parameterType, String parameterName, Expression initializer)
{
SingleVariableDeclaration methodSpecParameter = ast.newSingleVariableDeclaration();
- if(ast.apiLevel() == AST.JLS2)
- methodSpecParameter.setModifiers(modifier);
- else
- methodSpecParameter.modifiers().addAll(ast.newModifiers(modifier));
+ methodSpecParameter.modifiers().addAll(ast.newModifiers(modifier));
methodSpecParameter.setType(parameterType);
methodSpecParameter.setName(ast.newSimpleName(parameterName));
- methodSpecParameter.setExtraDimensions(dimension);
methodSpecParameter.setInitializer(initializer);
return methodSpecParameter;
}
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java
index 8e5903d..204ad4d 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/text/correction/MappingProposalSubProcessor.java
@@ -410,7 +410,6 @@
ASTNodeCreator.createArgument(ast, 0/*modifiers*/,
imports.addImport(paramType, ast),
argNames[i],
- 0 /*extraDimensions*/,
null));
}
ITypeBinding providedReturnType = methodBinding.getReturnType();
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/otrefactorings/extractcallin/ExtractCallinRefactoring.java b/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/otrefactorings/extractcallin/ExtractCallinRefactoring.java
index 58b0077..1601fcb 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/otrefactorings/extractcallin/ExtractCallinRefactoring.java
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/src/org/eclipse/objectteams/otdt/internal/refactoring/otrefactorings/extractcallin/ExtractCallinRefactoring.java
@@ -440,7 +440,7 @@
List<SingleVariableDeclaration> args = new ArrayList<SingleVariableDeclaration>();
for (int i = 0; i < methodBinding.getParameterTypes().length; i++) {
ITypeBinding paramType = methodBinding.getParameterTypes()[i];
- args.add(ASTNodeCreator.createArgument(ast, 0/* modifiers */, imports.addImport(paramType, ast), argNames[i], 0 /* extraDimensions */, null));
+ args.add(ASTNodeCreator.createArgument(ast, 0/* modifiers */, imports.addImport(paramType, ast), argNames[i], null));
}
ITypeBinding providedReturnType = methodBinding.getReturnType();
Type returnType = imports.addImport(providedReturnType, ast);
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/bindingeditor/BindingConfiguration.java b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/bindingeditor/BindingConfiguration.java
index 9281191..ed14a1c 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/bindingeditor/BindingConfiguration.java
+++ b/plugins/org.eclipse.objectteams.otdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/bindingeditor/BindingConfiguration.java
@@ -1304,12 +1304,12 @@
{
SingleVariableDeclaration param = (SingleVariableDeclaration)mSpecParameters.get(idx);
roleParameter =
- ASTNodeCreator.createArgument(ast, 0, parameterType, param.getName().toString(), 0, null);
+ ASTNodeCreator.createArgument(ast, 0, parameterType, param.getName().toString(), null);
}
else
{
roleParameter =
- ASTNodeCreator.createArgument(ast, 0, parameterType, parameterNames[idx], 0, null);
+ ASTNodeCreator.createArgument(ast, 0, parameterType, parameterNames[idx], null);
}
methodParameters.add(roleParameter);
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCallinMappingDeclarationTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCallinMappingDeclarationTest.java
index f6182d4..893cce3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCallinMappingDeclarationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCallinMappingDeclarationTest.java
@@ -274,8 +274,8 @@
RoleTypeDeclaration role = (RoleTypeDeclaration) aTeam.bodyDeclarations().get(0);
CallinMappingDeclaration callin = (CallinMappingDeclaration) role.bodyDeclarations().get(0);
- List argList1 = new ArrayList();
- argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s1",0,null));
+ List<SingleVariableDeclaration> argList1 = new ArrayList<SingleVariableDeclaration>();
+ argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s1",null));
MethodSpec methodSpec1 = ASTNodeCreator.createMethodSpec(
ast,
@@ -330,8 +330,8 @@
RoleTypeDeclaration role = (RoleTypeDeclaration) aTeam.bodyDeclarations().get(0);
CallinMappingDeclaration callin = (CallinMappingDeclaration) role.bodyDeclarations().get(0);
- List argList1 = new ArrayList();
- argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s3",0,null));
+ List<SingleVariableDeclaration> argList1 = new ArrayList<SingleVariableDeclaration>();
+ argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s3",null));
MethodSpec methodSpec1 = ASTNodeCreator.createMethodSpec(
ast,
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCalloutMappingDeclarationTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCalloutMappingDeclarationTest.java
index ccaec76..1d12461 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCalloutMappingDeclarationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/ASTRewritingModifyingCalloutMappingDeclarationTest.java
@@ -277,11 +277,11 @@
RoleTypeDeclaration role = (RoleTypeDeclaration) aTeam.bodyDeclarations().get(0);
CalloutMappingDeclaration callout = (CalloutMappingDeclaration) role.bodyDeclarations().get(0);
- List argList1 = new ArrayList();
- argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s1",0,null));
+ List<SingleVariableDeclaration> argList1 = new ArrayList<SingleVariableDeclaration>();
+ argList1.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s1",null));
- List argList2 = new ArrayList();
- argList2.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s2",0,null));
+ List<SingleVariableDeclaration> argList2 = new ArrayList<SingleVariableDeclaration>();
+ argList2.add(ASTNodeCreator.createArgument(ast,0,ASTNodeCreator.createType(ast, "String"),"s2",null));
MethodSpec methodSpec1 = ASTNodeCreator.createMethodSpec(
ast,