Merge fixes:

 - Re-applied parts from ea2c66d41813ffe0a73e9227d41cf335eedf7fb6 (orig)
   that got lost during merging.
 - Repair InvocationSite as of Bug 384380 (one method lost).
 - Import fixes in tests

1 files changed, 2 insertions, 2 deletions

diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
index 3df6304f2..14615141c 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/src/org/eclipse/objectteams/otdt/ui/tests/dom/rewrite/describing/TypeDeclarationTest.java
@@ -195,7 +195,7 @@ public class TypeDeclarationTest extends AstRewritingDescribingTest {
 		buf.append("}\n");
 		ICompilationUnit cu= pack1.createCompilationUnit("R1.java", buf.toString(), false, null);			
 
-		CompilationUnit astRoot= createAST3(cu);
+		CompilationUnit astRoot= createAST(cu);
 		ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST());
 		AST ast= astRoot.getAST();
 		
@@ -222,7 +222,7 @@ public class TypeDeclarationTest extends AstRewritingDescribingTest {
 		// re-get to also challenge ASTConverter and NaiveASTFlattener:
 		IPackageFragment pack2 = this.sourceFolder.createPackageFragment("test2.MyTeam", false, null);
 		cu= pack2.createCompilationUnit("R1.java", buf.toString(), false, null);		
-		astRoot= createAST3(cu);
+		astRoot= createAST(cu);
 		assertEqualString(astRoot.toString(), buf.toString());
 	}
 }